Merge branch 'master' into python3

Conflicts:
	pdm/srv.py

diff --combined pdm/srv.py
index abf7d89,b2c131a..80f9a26
--- 1/pdm/srv.py
--- 2/pdm/srv.py
+++ b/pdm/srv.py
@@@ -40,34 -40,35 +40,36 @@@ class repl(object)
          self.mod = types.ModuleType("repl")
          self.mod.echo = self.echo
          self.printer = pprint.PrettyPrinter(indent = 4, depth = 6)
 -        cl.send("+REPL\n")
 +        cl.send(b"+REPL\n")
  
      def sendlines(self, text):
          for line in text.split("\n"):
 -            self.cl.send(" " + line + "\n")
 +            self.cl.send(b" " + line.encode("utf-8") + b"\n")
  
      def echo(self, ob):
          self.sendlines(self.printer.pformat(ob))
  
      def command(self, cmd):
 +        cmd = cmd.decode("utf-8")
          try:
              try:
                  ccode = compile(cmd, "PDM Input", "eval")
              except SyntaxError:
                  ccode = compile(cmd, "PDM Input", "exec")
 -                exec ccode in self.mod.__dict__
 -                self.cl.send("+OK\n")
 +                exec(ccode, self.mod.__dict__)
 +                self.cl.send(b"+OK\n")
              else:
                  self.echo(eval(ccode, self.mod.__dict__))
 -                self.cl.send("+OK\n")
 +                self.cl.send(b"+OK\n")
          except:
-             for line in traceback.format_exception(*sys.exc_info()):
-                 self.cl.send(b" " + line.encode("utf-8"))
+             lines = ("".join(traceback.format_exception(*sys.exc_info()))).split("\n")
+             while len(lines) > 0 and lines[-1] == "": lines = lines[:-1]
+             for line in lines:
 -                self.cl.send(" " + line + "\n")
 -            self.cl.send("+EXC\n")
++                self.cl.send(b" " + line.encode("utf-8") + b"\n")
 +            self.cl.send(b"+EXC\n")
  
      def handle(self, buf):
 -        p = buf.find("\n\n")
 +        p = buf.find(b"\n\n")
          if p < 0:
              return buf
          cmd = buf[:p + 1]
@@@ -170,13 -171,13 +172,13 @@@ class perf(object)
      def __init__(self, cl):
          self.cl = cl
          self.odtab = {}
 -        cl.send("+PERF1\n")
 +        cl.send(b"+PERF1\n")
          self.buf = ""
          self.lock = threading.Lock()
          self.subscribed = {}
  
      def closed(self):
 -        for id, recv in self.subscribed.iteritems():
 +        for id, recv in self.subscribed.items():
              ob = self.odtab[id]
              if ob is None: continue
              ob, protos = ob
@@@ -198,7 -199,7 +200,7 @@@
              raise ValueError("Object does not support PDM introspection")
          try:
              proto = ob.pdm_protocols()
 -        except Exception, exc:
 +        except Exception as exc:
              raise ValueError("PDM introspection failed", exc)
          self.odtab[id] = ob, proto
          return proto
@@@ -215,7 -216,7 +217,7 @@@
              return
          try:
              proto = self.bindob(id, ob)
 -        except Exception, exc:
 +        except Exception as exc:
              self.send("-", exc)
              return
          self.send("+", proto)
@@@ -237,12 -238,12 +239,12 @@@
              return
          try:
              ob = src.lookup(obnm)
 -        except KeyError, exc:
 +        except KeyError as exc:
              self.send("-", exc)
              return
          try:
              proto = self.bindob(tgtid, ob)
 -        except Exception, exc:
 +        except Exception as exc:
              self.send("-", exc)
              return
          self.send("+", proto)
@@@ -272,7 -273,7 +274,7 @@@
              return
          try:
              ret = ob.readattr()
 -        except Exception, exc:
 +        except Exception as exc:
              self.send("-", Exception("Could not read attribute"))
              return
          self.send("+", ret)
@@@ -289,7 -290,7 +291,7 @@@
              return
          try:
              self.send("+", ob.invoke(method, *args, **kwargs))
 -        except Exception, exc:
 +        except Exception as exc:
              self.send("-", exc)
  
      def event(self, id, ob, ev):
@@@ -355,7 -356,7 +357,7 @@@ protocols["perf"] = per
  
  class client(threading.Thread):
      def __init__(self, sk):
 -        super(client, self).__init__(name = "Management client")
 +        super().__init__(name = "Management client")
          self.setDaemon(True)
          self.sk = sk
          self.handler = self
@@@ -364,10 -365,6 +366,10 @@@
          return self.sk.send(data)
  
      def choose(self, proto):
 +        try:
 +            proto = proto.decode("ascii")
 +        except UnicodeError:
 +            proto = None
          if proto in protocols:
              self.handler = protocols[proto](self)
          else:
@@@ -375,7 -372,7 +377,7 @@@
              raise Exception()
  
      def handle(self, buf):
 -        p = buf.find("\n")
 +        p = buf.find(b"\n")
          if p >= 0:
              proto = buf[:p]
              buf = buf[p + 1:]
@@@ -384,24 -381,24 +386,24 @@@
  
      def run(self):
          try:
 -            buf = ""
 -            self.send("+PDM1\n")
 +            buf = b""
 +            self.send(b"+PDM1\n")
              while True:
                  ret = self.sk.recv(1024)
 -                if ret == "":
 +                if ret == b"":
                      return
                  buf += ret
                  while True:
                      try:
                          nbuf = self.handler.handle(buf)
                      except:
 +                        #for line in traceback.format_exception(*sys.exc_info()):
 +                        #    print(line)
                          return
                      if nbuf == buf:
                          break
                      buf = nbuf
          finally:
 -            #for line in traceback.format_exception(*sys.exc_info()):
 -            #    print line
              try:
                  self.sk.close()
              finally:
@@@ -418,7 -415,7 +420,7 @@@ class listener(threading.Thread)
      tcplistener.
      """
      def __init__(self):
 -        super(listener, self).__init__(name = "Management listener")
 +        super().__init__(name = "Management listener")
          self.setDaemon(True)
  
      def listen(self, sk):
@@@ -446,14 -443,14 +448,14 @@@
  
  class unixlistener(listener):
      """Unix socket listener"""
 -    def __init__(self, name, mode = 0600, group = None):
 +    def __init__(self, name, mode = 0o600, group = None):
          """Create a listener that will bind to the Unix socket named
          by `name'. The socket will not actually be bound until the
          listener is started. The socket will be chmodded to `mode',
          and if `group' is given, the named group will be set as the
          owner of the socket.
          """
 -        super(unixlistener, self).__init__()
 +        super().__init__()
          self.name = name
          self.mode = mode
          self.group = group
@@@ -483,7 -480,7 +485,7 @@@ class tcplistener(listener)
          the given local interface. The socket will not actually be
          bound until the listener is started.
          """
 -        super(tcplistener, self).__init__()
 +        super().__init__()
          self.port = port
          self.bindaddr = bindaddr
  
@@@ -521,7 -518,7 +523,7 @@@ def listen(spec)
          last = spec
      if "/" in first:
          parts = spec.split(":")
 -        mode = 0600
 +        mode = 0o600
          group = None
          if len(parts) > 1:
              mode = int(parts[1], 8)