From 57966cac76ba412c8b9286394a72808b2908073d Mon Sep 17 00:00:00 2001 From: Li Fanxi Date: Thu, 4 Aug 2011 01:48:40 +0800 Subject: [PATCH 1/2] [Bug] Revert the wrong changes made when merging into trunk. fileName in FileStream object is only an ID of the file name and should not be processed by ascii_filename() to retain the '/' character --- src/calibre/ebooks/snb/snbfile.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/snb/snbfile.py b/src/calibre/ebooks/snb/snbfile.py index 88b586539b..1341632a55 100644 --- a/src/calibre/ebooks/snb/snbfile.py +++ b/src/calibre/ebooks/snb/snbfile.py @@ -7,7 +7,6 @@ __docformat__ = 'restructuredtext en' import sys, struct, zlib, bz2, os from calibre import guess_type -from calibre.utils.filenames import ascii_filename class FileStream: def IsBinary(self): @@ -158,7 +157,7 @@ class SNBFile: f.fileBody = open(os.path.join(tdir,fileName), 'rb').read() f.fileName = fileName.replace(os.sep, '/') if isinstance(f.fileName, unicode): - f.fileName = ascii_filename(f.fileName).encode('ascii') + f.fileName = f.fileName.encode("ascii", "ignore"); self.files.append(f) def AppendBinary(self, fileName, tdir): @@ -168,7 +167,7 @@ class SNBFile: f.fileBody = open(os.path.join(tdir,fileName), 'rb').read() f.fileName = fileName.replace(os.sep, '/') if isinstance(f.fileName, unicode): - f.fileName = ascii_filename(f.fileName).encode('ascii') + f.fileName = f.fileName.encode("ascii", "ignore"); self.files.append(f) def GetFileStream(self, fileName): From ba17bae957f95ad7f24d25f27feb4ecf56c9108f Mon Sep 17 00:00:00 2001 From: Li Fanxi Date: Thu, 4 Aug 2011 01:59:10 +0800 Subject: [PATCH 2/2] [Bug] Unable to connect to Bambook, due to API spec change in Device plugin. --- src/calibre/devices/bambook/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/devices/bambook/driver.py b/src/calibre/devices/bambook/driver.py index f251310d77..b3a552b33c 100644 --- a/src/calibre/devices/bambook/driver.py +++ b/src/calibre/devices/bambook/driver.py @@ -59,7 +59,7 @@ class BAMBOOK(DeviceConfig, DevicePlugin): def reset(self, key='-1', log_packets=False, report_progress=None, detected_device=None) : - self.open() + self.open(None) def open(self, library_uuid): # Make sure the Bambook library is ready