Merge lp:~lifanxi/calibre/SNBOutput into lp:calibre

[Li Fanxi]

Would you please merge this tree to include the latest bug fixes?

The code change in snbfile.py is correct, the fileName member in FileStream object should not be processed by ascii_filename, because it must contain the "/" character.

Thanks.

=== modified file 'src/calibre/devices/bambook/driver.py'
--- src/calibre/devices/bambook/driver.py	2011-02-28 13:59:35 +0000
+++ src/calibre/devices/bambook/driver.py	2011-08-03 18:19:46 +0000
@@ -59,7 +59,7 @@
 
     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

=== modified file 'src/calibre/ebooks/snb/snbfile.py'
--- src/calibre/ebooks/snb/snbfile.py	2011-07-11 16:45:11 +0000
+++ src/calibre/ebooks/snb/snbfile.py	2011-08-03 18:19:46 +0000
@@ -7,7 +7,6 @@
 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 @@
         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 @@
         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):