Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2011-08-03 13:14:35 -06:00
commit 5e2de3f121
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/bambook/driver.py
View File

@ -59,7 +59,7 @@ class BAMBOOK(DeviceConfig, DevicePlugin):
def reset(self, key='-1', log_packets=False, report_progress=None, def reset(self, key='-1', log_packets=False, report_progress=None,
detected_device=None) : detected_device=None) :
self.open() self.open(None)
def open(self, library_uuid): def open(self, library_uuid):
# Make sure the Bambook library is ready # Make sure the Bambook library is ready

5
src/calibre/ebooks/snb/snbfile.py
View File

@ -7,7 +7,6 @@ __docformat__ = 'restructuredtext en'
import sys, struct, zlib, bz2, os import sys, struct, zlib, bz2, os
from calibre import guess_type from calibre import guess_type
from calibre.utils.filenames import ascii_filename
class FileStream: class FileStream:
def IsBinary(self): def IsBinary(self):
@ -158,7 +157,7 @@ class SNBFile:
f.fileBody = open(os.path.join(tdir,fileName), 'rb').read() f.fileBody = open(os.path.join(tdir,fileName), 'rb').read()
f.fileName = fileName.replace(os.sep, '/') f.fileName = fileName.replace(os.sep, '/')
if isinstance(f.fileName, unicode): if isinstance(f.fileName, unicode):
f.fileName = ascii_filename(f.fileName).encode('ascii') f.fileName = f.fileName.encode("ascii", "ignore");
self.files.append(f) self.files.append(f)
def AppendBinary(self, fileName, tdir): def AppendBinary(self, fileName, tdir):
@ -168,7 +167,7 @@ class SNBFile:
f.fileBody = open(os.path.join(tdir,fileName), 'rb').read() f.fileBody = open(os.path.join(tdir,fileName), 'rb').read()
f.fileName = fileName.replace(os.sep, '/') f.fileName = fileName.replace(os.sep, '/')
if isinstance(f.fileName, unicode): if isinstance(f.fileName, unicode):
f.fileName = ascii_filename(f.fileName).encode('ascii') f.fileName = f.fileName.encode("ascii", "ignore");
self.files.append(f) self.files.append(f)
def GetFileStream(self, fileName): def GetFileStream(self, fileName):