[PATCH linux-firmware] check_whence: python3/utf-8 support

[PATCH linux-firmware] check_whence: python3/utf-8 support

[Brian Norris]

WHENCE contains non-ASCII characters, so we should specify an encoding.
To get the encoding= arg in python2, we pull open from 'io' directly.

Signed-off-by: Brian Norris <briannorris@chromium.org>
---
 check_whence.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/check_whence.py b/check_whence.py
index 04f41dfc5f9e..2d31f3839106 100755
--- a/check_whence.py
+++ b/check_whence.py
@@ -1,9 +1,10 @@
 #!/usr/bin/python
 
 import os, re, sys
+from io import open
 
 def list_whence():
-    with open('WHENCE') as whence:
+    with open('WHENCE', encoding='utf-8') as whence:
         for line in whence:
             match = re.match(r'(?:File|Source):\s*"(.*)"', line)
             if match:
-- 
2.25.0.265.gbab2e86ba0-goog

Re: [PATCH linux-firmware] check_whence: python3/utf-8 support

[Josh Boyer]

On Fri, Feb 28, 2020 at 9:15 PM Brian Norris <briannorris@chromium.org> wrote:
>
> WHENCE contains non-ASCII characters, so we should specify an encoding.
> To get the encoding= arg in python2, we pull open from 'io' directly.
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>

Both of your patches applied and pushed out.  Thanks!

josh

> ---
>  check_whence.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/check_whence.py b/check_whence.py
> index 04f41dfc5f9e..2d31f3839106 100755
> --- a/check_whence.py
> +++ b/check_whence.py
> @@ -1,9 +1,10 @@
>  #!/usr/bin/python
>
>  import os, re, sys
> +from io import open
>
>  def list_whence():
> -    with open('WHENCE') as whence:
> +    with open('WHENCE', encoding='utf-8') as whence:
>          for line in whence:
>              match = re.match(r'(?:File|Source):\s*"(.*)"', line)
>              if match:
> --
> 2.25.0.265.gbab2e86ba0-goog
>