[PATCH] shader-debugger: Force file/stdout IO as UTF-8

[PATCH] shader-debugger: Force file/stdout IO as UTF-8

[Rémi Cardona]

Not all locales on linux are UTF-8, the most notable being the C locale.
Python will use the ASCII codec for stream IO in this case and will barf
on the Copyright sign at the top of .g4a files.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519434
Signed-off-by: Rémi Cardona <remi@gentoo.org>
---
 debugger/system_routine/pre_cpp.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debugger/system_routine/pre_cpp.py b/debugger/system_routine/pre_cpp.py
index effea0e..584d2af 100755
--- a/debugger/system_routine/pre_cpp.py
+++ b/debugger/system_routine/pre_cpp.py
@@ -33,7 +33,10 @@
 
 import sys,re
 
-file = open(sys.argv[1], "r")
+# make sure both input file and stdout are handled as utf-8 text, regardless
+# of current locale (eg. LANG=C which tells python to use ascii encoding)
+sys.stdout = open(sys.__stdout__.fileno(), "a", encoding="utf-8")
+file = open(sys.argv[1], "r", encoding="utf-8")
 
 lines = file.readlines()
 len(lines)
-- 
2.0.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] shader-debugger: Force file/stdout IO as UTF-8

[Rémi Cardona]

Le 18/08/2014 01:09, Rémi Cardona a écrit :
> Not all locales on linux are UTF-8, the most notable being the C locale.
> Python will use the ASCII codec for stream IO in this case and will barf
> on the Copyright sign at the top of .g4a files.
> 
> Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519434
> Signed-off-by: Rémi Cardona <remi@gentoo.org>

Ping ?

Rémi
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] shader-debugger: Force file/stdout IO as UTF-8

[Damien Lespiau]

On Mon, Aug 18, 2014 at 01:09:15AM +0200, Rémi Cardona wrote:
> Not all locales on linux are UTF-8, the most notable being the C locale.
> Python will use the ASCII codec for stream IO in this case and will barf
> on the Copyright sign at the top of .g4a files.
> 
> Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519434
> Signed-off-by: Rémi Cardona <remi@gentoo.org>

Looks reasonable, pushed, thanks for the patch.

-- 
Damien

> ---
>  debugger/system_routine/pre_cpp.py | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/debugger/system_routine/pre_cpp.py b/debugger/system_routine/pre_cpp.py
> index effea0e..584d2af 100755
> --- a/debugger/system_routine/pre_cpp.py
> +++ b/debugger/system_routine/pre_cpp.py
> @@ -33,7 +33,10 @@
>  
>  import sys,re
>  
> -file = open(sys.argv[1], "r")
> +# make sure both input file and stdout are handled as utf-8 text, regardless
> +# of current locale (eg. LANG=C which tells python to use ascii encoding)
> +sys.stdout = open(sys.__stdout__.fileno(), "a", encoding="utf-8")
> +file = open(sys.argv[1], "r", encoding="utf-8")
>  
>  lines = file.readlines()
>  len(lines)
> -- 
> 2.0.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx