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

Misc fixes for previous py3 PR

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-27 06:53:58 +05:30
parent 68afcf4598
commit f0ab48d1a9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/library/catalogs/bibtex.py
View File

@ -14,7 +14,7 @@ from calibre.library.catalogs import FIELDS, TEMPLATE_ALLOWED_FIELDS
from calibre.customize.conversion import DummyReporter from calibre.customize.conversion import DummyReporter
from calibre.constants import preferred_encoding from calibre.constants import preferred_encoding
from calibre.ebooks.metadata import format_isbn from calibre.ebooks.metadata import format_isbn
from polyglot.builtins import string_or_bytes, unicode_type from polyglot.builtins import string_or_bytes
class BIBTEX(CatalogPlugin): class BIBTEX(CatalogPlugin):
@ -350,7 +350,7 @@ class BIBTEX(CatalogPlugin):
bibtexc.ascii_bibtex = True bibtexc.ascii_bibtex = True
# Check citation choice and go to default in case of bad CLI # Check citation choice and go to default in case of bad CLI
if isinstance(opts.impcit, (str, unicode_type)) : if isinstance(opts.impcit, string_or_bytes) :
if opts.impcit == 'False' : if opts.impcit == 'False' :
citation_bibtex= False citation_bibtex= False
elif opts.impcit == 'True' : elif opts.impcit == 'True' :
@ -362,7 +362,7 @@ class BIBTEX(CatalogPlugin):
citation_bibtex= opts.impcit citation_bibtex= opts.impcit
# Check add file entry and go to default in case of bad CLI # Check add file entry and go to default in case of bad CLI
if isinstance(opts.addfiles, (StringType, UnicodeType)) : if isinstance(opts.addfiles, string_or_bytes) :
if opts.addfiles == 'False' : if opts.addfiles == 'False' :
addfiles_bibtex = False addfiles_bibtex = False
elif opts.addfiles == 'True' : elif opts.addfiles == 'True' :

7
src/calibre/srv/http_response.py
View File

@ -30,6 +30,8 @@ from polyglot import http_client, reprlib
Range = namedtuple('Range', 'start stop size') Range = namedtuple('Range', 'start stop size')
MULTIPART_SEPARATOR = uuid.uuid4().hex MULTIPART_SEPARATOR = uuid.uuid4().hex
if isinstance(MULTIPART_SEPARATOR, bytes):
MULTIPART_SEPARATOR = MULTIPART_SEPARATOR.decode('ascii')
COMPRESSIBLE_TYPES = {'application/json', 'application/javascript', 'application/xml', 'application/oebps-package+xml'} COMPRESSIBLE_TYPES = {'application/json', 'application/javascript', 'application/xml', 'application/oebps-package+xml'}
if is_py3: if is_py3:
import zlib import zlib
@ -450,7 +452,10 @@ class HTTPConnection(HTTPRequest):
def send_range_not_satisfiable(self, content_length): def send_range_not_satisfiable(self, content_length):
buf = [ buf = [
'%s %d %s' % (self.response_protocol, http_client.REQUESTED_RANGE_NOT_SATISFIABLE, http_client.responses[http_client.REQUESTED_RANGE_NOT_SATISFIABLE]), '%s %d %s' % (
self.response_protocol,
http_client.REQUESTED_RANGE_NOT_SATISFIABLE,
http_client.responses[http_client.REQUESTED_RANGE_NOT_SATISFIABLE]),
"Date: " + http_date(), "Date: " + http_date(),
"Content-Range: bytes */%d" % content_length, "Content-Range: bytes */%d" % content_length,
] ]

5
src/calibre/utils/unrar.py
View File

@ -127,8 +127,9 @@ def test_basic():
def do_test(stream): def do_test(stream):
c = comment(stream) c = comment(stream)
if c != 'some comment\n': expected = 'some comment\n'
raise ValueError('Comment not read: %r != %r' % (c, b'some comment\n')) if c != expected:
raise ValueError('Comment not read: %r != %r' % (c, expected))
if set(names(stream)) != { if set(names(stream)) != {
'1/sub-one', 'one.txt', '2/sub-two.txt', '诶比屁.txt', 'Füße.txt', '1/sub-one', 'one.txt', '2/sub-two.txt', '诶比屁.txt', 'Füße.txt',
'uncompressed', 'max-compressed'}: 'uncompressed', 'max-compressed'}: