From 59d22bed5d26acc8d58ad307199999777db5427c Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 29 Mar 2011 17:20:13 +0800 Subject: [PATCH] Import: Remove unicode translation from addImportFile A filename is an almost arbitrary binary sequence, assuming it can be encoded in utf-8 caused crashes on certain file names. --- pyfpdb/fpdb_import.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py index bc28467b..a95f8627 100644 --- a/pyfpdb/fpdb_import.py +++ b/pyfpdb/fpdb_import.py @@ -170,7 +170,7 @@ class Importer: def addImportFile(self, filename, site = "default", filter = "passthrough"): #TODO: test it is a valid file -> put that in config!! #print "addimportfile: filename is a", filename.__class__ - # filename now comes in as unicode + # filename not guaranteed to be unicode if filename in self.filelist or not os.path.exists(filename): return self.filelist[filename] = [site] + [filter] @@ -196,11 +196,10 @@ class Importer: if os.path.isdir(inputPath): for subdir in os.walk(inputPath): for file in subdir[2]: - self.addImportFile(unicode(os.path.join(subdir[0], file),'utf-8'), - site=site, filter=filter) + self.addImportFile(os.path.join(subdir[0], file), site=site, filter=filter) else: - - self.addImportFile(unicode(inputPath,'utf-8'), site=site, filter=filter) + self.addImportFile(inputPath, site=site, filter=filter) + #Add a directory of files to filelist #Only one import directory per site supported. #dirlist is a hash of lists: