Changeset 1720 for ZMS/trunk

Timestamp:

09.11.2011 20:48:51 (6 months ago)

Author:

zmsdev

Message:

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

Location:

ZMS/trunk

Files:

• _blobfields.py (modified) (1 diff)
• _fileutil.py (modified) (3 diffs)

ZMS/trunk/_blobfields.py

@@ -212 +212 @@
   blob.aq_parent = self
   blob.mediadbfile = None
-  blob.filename = _fileutil.extractFilename( filename)
+  blob.filename = _fileutil.extractFilename( filename, undoable=True).encode('utf-8')
   # Check size.
   if self is not None:

ZMS/trunk/_fileutil.py

@@ -61 +61 @@
 def importZexp(self, filename):
   filepath = INSTANCE_HOME + '/import/' + filename
-  self.manage_importObject(filename)
+  self.manage_importObject(str(filename))
   remove(filepath)
 
@@ -71 +71 @@
 IN:  path
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-def extractFilename(path, sep=None):
+def extractFilename(path, sep=None, undoable=False):
   if sep is None:
-    path = getOSPath(path) 
+    path = getOSPath(path,undoable=undoable)
   items = path.split( os.sep)
   lastitem = items[len(items)-1]
@@ -97 +97 @@
 Return path with OS separators.
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-def getOSPath(path, chs=range(32)+[34,39,60,62,63,127]):
+def getOSPath(path, chs=range(32)+[34,39,60,62,63,127], undoable=False):
   path = path.replace('\\',os.sep)
   path = path.replace('/',os.sep)
   if type( path) is str:
     path = unicode(path, 'latin-1')
-  if os.name != "nt":
+  if undoable or os.name != "nt":
     path = path.encode('ascii', 'replace') # replace uncodable characters by ? (63)
   if len( chs) > 0: