diff options
author | Joel B. Mohler <jmohler@gamry.com> | 2014-01-20 12:38:32 -0500 |
---|---|---|
committer | John Ehresman <jpe@wingware.com> | 2014-04-15 21:51:57 +0200 |
commit | 14976792ee1360c02b43e12d246b4de2ebdfd8a3 (patch) | |
tree | 0ed03c180a943232c4014d8a0cbecd582ccc5930 | |
parent | d2a47ab8f27af7e74d34797464da85c128c17c37 (diff) |
use file system encoding instead of assumed 'ascii'
Task-number: PYSIDE-211
Change-Id: I4233d093cf2abe1eeb006fd836c10d1ddcbc9858
Reviewed-by: Roman Lacko <backup.rlacko@gmail.com>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: John Ehresman <jpe@wingware.com>
-rw-r--r-- | PySide/_utils.py.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/PySide/_utils.py.in b/PySide/_utils.py.in index b8199fc43..2c77ab4e9 100644 --- a/PySide/_utils.py.in +++ b/PySide/_utils.py.in @@ -45,16 +45,20 @@ if sys.platform == 'win32': if PY_2: def u(x): return unicode(x) + def u_fs(x): + return unicode(x, sys.getfilesystemencoding()) else: def u(x): return x + def u_fs(x): + return x def _get_win32_short_name(s): """ Returns short name """ buf_size = MAX_PATH for i in range(2): buf = create_unicode_buffer(u('\0') * (buf_size + 1)) - r = GetShortPathNameW(u(s), buf, buf_size) + r = GetShortPathNameW(u_fs(s), buf, buf_size) if r == 0: raise WinError() if r < buf_size: @@ -69,7 +73,7 @@ if sys.platform == 'win32': buf_size = MAX_PATH for i in range(2): buf = create_unicode_buffer(u('\0') * (buf_size + 1)) - r = GetLongPathNameW(u(s), buf, buf_size) + r = GetLongPathNameW(u_fs(s), buf, buf_size) if r == 0: raise WinError() if r < buf_size: |