Changeset 1717

Timestamp:

27.10.2011 22:03:04 (7 months ago)

Author:

zmsdev

Message:

Applied fix for path-encoding in file-util on win32.

File:

• ZMS/trunk/_fileutil.py (modified) (2 diffs)

ZMS/trunk/_fileutil.py

@@ -102 +102 @@
   if type( path) is str:
     path = unicode(path, 'latin-1')
-  path = path.encode('ascii', 'replace') # replace uncodable characters by ? (63)
+  if os.name != "nt":
+    path = path.encode('ascii', 'replace') # replace uncodable characters by ? (63)
   if len( chs) > 0:
     for ch in chs:
@@ -190 +191 @@
       mode = os.stat(local_filename)[stat.ST_MODE]
       if filter is None or fnmatch.fnmatch(filename, filter):
+        u_local_filename = local_filename
+        if type(u_local_filename) is not unicode:
+          u_local_filename = unicode(local_filename,'latin-1')
         d = {}
-        d['local_filename']=unicode(local_filename,'latin-1').encode('utf-8')
-        d['filename']=unicode(extractFilename(local_filename),'latin-1').encode('utf-8')
+        d['local_filename']=u_local_filename.encode('utf-8')
+        d['filename']=extractFilename(u_local_filename).encode('utf-8')
         if stat.S_ISDIR(mode):
           mtime = os.path.getmtime( local_filename)