From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 22 Dec 2011 05:12:45 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Tag: 0.1~3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=864a9d46e7cc4a67bd244947b933baabc69c902f;p=pdm.git

Merge branch 'master' into python3
---

864a9d46e7cc4a67bd244947b933baabc69c902f
diff --cc pdm/cli.py
index 878a670,bb2bbf5..6af06f1
--- a/pdm/cli.py
+++ b/pdm/cli.py
@@@ -47,9 -47,12 +47,12 @@@ class client(object)
      def close(self):
          self.sk.close()
  
+     def fileno(self):
+         return self.sk.fileno()
+ 
      def readline(self):
          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:]