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

py3: Fix smart device driver

Browse Source 
Merge branch 'fix-encode' of https://github.com/erayd/calibre
This commit is contained in:
Kovid Goyal 2020-02-25 19:28:36 +05:30
commit 66ebe3689e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/devices/smart_device_app/driver.py
View File

@ -36,7 +36,7 @@ from calibre.utils.filenames import ascii_filename as sanitize, shorten_componen
from calibre.utils.mdns import (publish as publish_zeroconf, unpublish as from calibre.utils.mdns import (publish as publish_zeroconf, unpublish as
unpublish_zeroconf, get_all_ips) unpublish_zeroconf, get_all_ips)
from calibre.utils.socket_inheritance import set_socket_inherit from calibre.utils.socket_inheritance import set_socket_inherit
from polyglot.builtins import unicode_type, iteritems, itervalues from polyglot.builtins import as_bytes, unicode_type, iteritems, itervalues
from polyglot import queue from polyglot import queue
@ -100,7 +100,7 @@ class ConnectionListener(Thread):
s = self.driver._json_encode( s = self.driver._json_encode(
self.driver.opcodes['CALIBRE_BUSY'], self.driver.opcodes['CALIBRE_BUSY'],
{'otherDevice': d.get_gui_name()}) {'otherDevice': d.get_gui_name()})
self.driver._send_byte_string(device_socket, (b'%d' % len(s)) + s) self.driver._send_byte_string(device_socket, (b'%d' % len(s)) + as_bytes(s))
sock.close() sock.close()
except queue.Empty: except queue.Empty:
pass pass
@ -636,7 +636,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
s = self._json_encode(self.opcodes[op], arg) s = self._json_encode(self.opcodes[op], arg)
if print_debug_info and extra_debug: if print_debug_info and extra_debug:
self._debug('send string', s) self._debug('send string', s)
self._send_byte_string(self.device_socket, (b'%d' % len(s)) + s) self._send_byte_string(self.device_socket, (b'%d' % len(s)) + as_bytes(s))
if not wait_for_response: if not wait_for_response:
return None, None return None, None
return self._receive_from_client(print_debug_info=print_debug_info) return self._receive_from_client(print_debug_info=print_debug_info)