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

py3 compat for prpdb

Browse Source 
Note this is not tested as I dont use it myself. Fixes #1903330 [TypeError when running calibre.rpdb cli](https://bugs.launchpad.net/calibre/+bug/1903330)
This commit is contained in:
Kovid Goyal 2020-11-06 23:12:53 +05:30
parent 079a47cf81
commit bdb403fc1c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/calibre/rpdb.py
View File

@ -8,12 +8,11 @@ __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
import pdb, socket, inspect, sys, select, os, atexit, time
from calibre import prints
from calibre.utils.ipc import eintr_retry_call
from calibre.constants import cache_dir
from polyglot.builtins import range, raw_input as rinput
PROMPT = b'(debug) '
QUESTION = b'\x00\x01\x02'
PROMPT = '(debug) '
QUESTION = '\x00\x01\x02'
class RemotePdb(pdb.Pdb):
@ -59,7 +58,7 @@ class RemotePdb(pdb.Pdb):
def do_clear(self, arg):
if not arg:
ans = self.ask_question("Clear all breaks? [y/n]: ")
if ans.strip().lower() in {b'y', b'yes'}:
if ans.strip().lower() in {'y', 'yes'}:
self.clear_all_breaks()
self.prints('All breaks cleared')
return
@ -70,7 +69,7 @@ class RemotePdb(pdb.Pdb):
if not self.breaks:
ans = self.ask_question(
'There are no breakpoints set. Continuing will terminate this debug session. Are you sure? [y/n]: ')
if ans.strip().lower() in {b'y', b'yes'}:
if ans.strip().lower() in {'y', 'yes'}:
return self.end_session()
return
return pdb.Pdb.do_continue(self, arg)
@ -120,36 +119,33 @@ def cli(port=4444):
p = pdb.Pdb()
readline.set_completer(p.complete)
readline.parse_and_bind("tab: complete")
stdin = getattr(sys.stdin, 'buffer', sys.stdin)
stdout = getattr(sys.stdout, 'buffer', sys.stdout)
sockf = sock.makefile('rw')
try:
while True:
recvd = b''
recvd = ''
while not recvd.endswith(PROMPT) or select.select([sock], [], [], 0) == ([sock], [], []):
buf = eintr_retry_call(sock.recv, 16 * 1024)
buf = sockf.read()
if not buf:
return
recvd += buf
recvd = recvd[:-len(PROMPT)]
if recvd.startswith(QUESTION):
recvd = recvd[len(QUESTION):]
stdout.write(recvd)
raw = stdin.readline() or b'n'
sys.stdout.write(recvd)
raw = sys.stdin.readline() or 'n'
else:
stdout.write(recvd)
raw = b''
sys.stdout.write(recvd)
raw = ''
try:
raw = rinput(PROMPT.decode('utf-8'))
except (EOFError, KeyboardInterrupt):
pass
else:
if not isinstance(raw, bytes):
raw = raw.encode('utf-8')
raw += b'\n'
raw += '\n'
if not raw:
raw = b'quit\n'
eintr_retry_call(sock.send, raw)
raw = 'quit\n'
sockf.write(raw)
except KeyboardInterrupt:
pass