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

Don't pass the "format" argument of struct.pack as a bytestring.

Browse Source 
It's the format argument, not actual data, and it's perfectly happy to
be a plain str. But using a b'' string in python3 means we cannot
interpolate an int inside, so we get the error message:

>>> serialize_binary('foo', True)
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/home/eschwartz/git/calibre/src/calibre/gui2/win_file_dialogs.py", line 61, in serialize_binary
    return struct.pack(b'=B%ssB' % len(key), len(key), key, int(val))
TypeError: %b requires a bytes-like object, or an object that implements __bytes__, not 'int'
This commit is contained in:
Eli Schwartz 2019-12-17 20:01:30 -05:00
parent e082b67a6e
commit 0d7ae5b1b9
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/win_file_dialogs.py
View File

@ -49,16 +49,16 @@ def get_hwnd(widget=None):
def serialize_hwnd(hwnd): def serialize_hwnd(hwnd):
if hwnd is None: if hwnd is None:
return b'' return b''
return struct.pack(b'=B4s' + (b'Q' if is64bit else b'I'), 4, b'HWND', int(hwnd)) return struct.pack('=B4s' + ('Q' if is64bit else 'I'), 4, b'HWND', int(hwnd))
def serialize_secret(secret): def serialize_secret(secret):
return struct.pack(b'=B6s32s', 6, b'SECRET', secret) return struct.pack('=B6s32s', 6, b'SECRET', secret)
def serialize_binary(key, val): def serialize_binary(key, val):
key = key.encode('ascii') if not isinstance(key, bytes) else key key = key.encode('ascii') if not isinstance(key, bytes) else key
return struct.pack(b'=B%ssB' % len(key), len(key), key, int(val)) return struct.pack('=B%ssB' % len(key), len(key), key, int(val))
def serialize_string(key, val): def serialize_string(key, val):
@ -66,16 +66,16 @@ def serialize_string(key, val):
val = unicode_type(val).encode('utf-8') val = unicode_type(val).encode('utf-8')
if len(val) > 2**16 - 1: if len(val) > 2**16 - 1:
raise ValueError('%s is too long' % key) raise ValueError('%s is too long' % key)
return struct.pack(b'=B%dsH%ds' % (len(key), len(val)), len(key), key, len(val), val) return struct.pack('=B%dsH%ds' % (len(key), len(val)), len(key), key, len(val), val)
def serialize_file_types(file_types): def serialize_file_types(file_types):
key = b"FILE_TYPES" key = b"FILE_TYPES"
buf = [struct.pack(b'=B%dsH' % len(key), len(key), key, len(file_types))] buf = [struct.pack('=B%dsH' % len(key), len(key), key, len(file_types))]
def add(x): def add(x):
x = x.encode('utf-8').replace(b'\0', b'') x = x.encode('utf-8').replace(b'\0', b'')
buf.append(struct.pack(b'=H%ds' % len(x), len(x), x)) buf.append(struct.pack('=H%ds' % len(x), len(x), x))
for name, extensions in file_types: for name, extensions in file_types:
add(name or _('Files')) add(name or _('Files'))
if isinstance(extensions, string_or_bytes): if isinstance(extensions, string_or_bytes):