Dolda2000 GitWeb
/
pdm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into python3
[pdm.git]
/
pdm
/
cli.py
diff --git
a/pdm/cli.py
b/pdm/cli.py
index
46276be
..
32580bb
100644
(file)
--- a/
pdm/cli.py
+++ b/
pdm/cli.py
@@
-59,9
+59,9
@@
class client(object):
select() method).
"""
self.sk = resolve(sk)
select() method).
"""
self.sk = resolve(sk)
- self.buf = ""
+ self.buf =
b
""
line = self.readline()
line = self.readline()
- if line != "+PDM1":
+ if line !=
b
"+PDM1":
raise protoerr("Illegal protocol signature")
if proto is not None:
self.select(proto)
raise protoerr("Illegal protocol signature")
if proto is not None:
self.select(proto)
@@
-77,23
+77,25
@@
class client(object):
def readline(self):
"""Read a single NL-terminated line and return it."""
while True:
def readline(self):
"""Read a single NL-terminated line and return it."""
while True:
- p = self.buf.find("\n")
+ p = self.buf.find(
b
"\n")
if p >= 0:
ret = self.buf[:p]
self.buf = self.buf[p + 1:]
return ret
ret = self.sk.recv(1024)
if p >= 0:
ret = self.buf[:p]
self.buf = self.buf[p + 1:]
return ret
ret = self.sk.recv(1024)
- if ret == "":
+ if ret ==
b
"":
return None
self.buf += ret
def select(self, proto):
"""Negotiate the given subprotocol with the server"""
return None
self.buf += ret
def select(self, proto):
"""Negotiate the given subprotocol with the server"""
- if "\n" in proto:
+ if isinstance(proto, str):
+ proto = proto.encode("ascii")
+ if b"\n" in proto:
raise Exception("Illegal protocol specified: %r" % proto)
raise Exception("Illegal protocol specified: %r" % proto)
- self.sk.send(proto + "\n")
+ self.sk.send(proto +
b
"\n")
rep = self.readline()
rep = self.readline()
- if len(rep) < 1 or rep[0] !=
"+"
:
+ if len(rep) < 1 or rep[0] !=
b"+"[0]
:
raise protoerr("Error reply when selecting protocol %s: %s" % (proto, rep[1:]))
def __enter__(self):
raise protoerr("Error reply when selecting protocol %s: %s" % (proto, rep[1:]))
def __enter__(self):
@@
-111,7
+113,7
@@
class replclient(client):
"""
def __init__(self, sk):
"""Create a connected client as documented in the `client' class."""
"""
def __init__(self, sk):
"""Create a connected client as documented in the `client' class."""
- super(
replclient, self
).__init__(sk, "repl")
+ super().__init__(sk, "repl")
def run(self, code):
"""Run a single block of Python code on the server. Returns
def run(self, code):
"""Run a single block of Python code on the server. Returns
@@
-124,16
+126,16
@@
class replclient(client):
code = ncode
while len(code) > 0 and code[-1] == "\n":
code = code[:-1]
code = ncode
while len(code) > 0 and code[-1] == "\n":
code = code[:-1]
- self.sk.send(
code + "\n\n"
)
- buf = ""
+ self.sk.send(
(code + "\n\n").encode("utf-8")
)
+ buf =
b
""
while True:
ln = self.readline()
while True:
ln = self.readline()
- if ln[0] ==
" "
:
- buf += ln[1:] + "\n"
- elif ln[0] ==
"+"
:
- return buf
- elif ln[0] ==
"-"
:
- raise protoerr("Error reply: %s" % ln[1:])
+ if ln[0] ==
b" "[0]
:
+ buf += ln[1:] +
b
"\n"
+ elif ln[0] ==
b"+"[0]
:
+ return buf
.decode("utf-8")
+ elif ln[0] ==
b"-"[0]
:
+ raise protoerr("Error reply: %s" % ln[1:]
.decode("utf-8")
)
else:
raise protoerr("Illegal reply: %s" % ln)
else:
raise protoerr("Illegal reply: %s" % ln)
@@
-223,7
+225,7
@@
class perfclient(client):
"""
def __init__(self, sk):
"""Create a connected client as documented in the `client' class."""
"""
def __init__(self, sk):
"""Create a connected client as documented in the `client' class."""
- super(
perfclient, self
).__init__(sk, "perf")
+ super().__init__(sk, "perf")
self.nextid = 0
self.lock = threading.Lock()
self.proxies = {}
self.nextid = 0
self.lock = threading.Lock()
self.proxies = {}
@@
-235,10
+237,10
@@
class perfclient(client):
self.sk.send(buf)
def recvb(self, num):
self.sk.send(buf)
def recvb(self, num):
- buf = ""
+ buf =
b
""
while len(buf) < num:
data = self.sk.recv(num - len(buf))
while len(buf) < num:
data = self.sk.recv(num - len(buf))
- if data == "":
+ if data ==
b
"":
raise EOFError()
buf += data
return buf
raise EOFError()
buf += data
return buf