Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-02 18:13:27 +02:00
Code Issues 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 @@ def __init__(self, ip):
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

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

@ -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 @@ def AppendPlain(self, fileName, tdir):
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 @@ def AppendBinary(self, fileName, tdir):
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):