[Python-checkins] r85116 - in python/branches/py3k: Demo/zlib/minigzip.py Lib/posixpath.py

[victor.stinner]

Author: victor.stinner
Date: Wed Sep 29 18:59:18 2010
New Revision: 85116

Log:
Use os.fsencode() to support surrogates


Modified:
   python/branches/py3k/Demo/zlib/minigzip.py
   python/branches/py3k/Lib/posixpath.py

Modified: python/branches/py3k/Demo/zlib/minigzip.py
==============================================================================
--- python/branches/py3k/Demo/zlib/minigzip.py	(original)
+++ python/branches/py3k/Demo/zlib/minigzip.py	Wed Sep 29 18:59:18 2010
@@ -31,7 +31,7 @@
     write32(output, mtime)
     output.write(b'\002')                # ... slowest compression alg. ...
     output.write(b'\377')                # ... OS (=unknown) ...
-    bfilename = filename.encode(sys.getfilesystemencoding())
+    bfilename = os.fsencode(filename)
     output.write(bfilename + b'\000')    # ... original filename ...
 
     crcval = zlib.crc32(b'')

Modified: python/branches/py3k/Lib/posixpath.py
==============================================================================
--- python/branches/py3k/Lib/posixpath.py	(original)
+++ python/branches/py3k/Lib/posixpath.py	Wed Sep 29 18:59:18 2010
@@ -262,7 +262,7 @@
             return path
         userhome = pwent.pw_dir
     if isinstance(path, bytes):
-        userhome = userhome.encode(sys.getfilesystemencoding())
+        userhome = os.fsencode(userhome)
         root = b'/'
     else:
         root = '/'