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

[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

Browse Source
This commit is contained in:
Li Fanxi 2011-08-04 01:48:40 +08:00
parent 96fa2af7cd
commit 57966cac76
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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):