[fea] py3 support and bump

Author: mosquito

pypi_server/__init__.py

@@ -9,7 +9,7 @@
     ("Dmitry Orlov", "me@mosquito.su")
 ]
 
-version_info = (0, 3, 11)
+version_info = (0, 3, 12)
 
 __version__ = ".".join(map(str, version_info))
 __author__ = ", ".join("{0} <{1}>".format(*author) for author in author_info)

pypi_server/handlers/pypi/package.py

@@ -8,6 +8,7 @@
 from pypi_server import PY2
 from pypi_server.db import DB
 from pypi_server.handlers.pypi.proxy.client import PYPIClient
+from six import b
 from tornado.gen import coroutine, Task, maybe_future, Return
 from tornado.web import asynchronous, HTTPError
 from tornado.httpclient import AsyncHTTPClient
@@ -136,7 +137,7 @@ def wrap(self, *args, **kwargs):
         if auth_type.lower() != 'basic':
             raise Return(self.send_error(400))
 
-        username, password = map(unquote_plus, base64.b64decode(data).split(":"))
+        username, password = map(lambda x: unquote_plus(x.decode("utf-8")), base64.b64decode(b(data)).split(b(":")))
         try:
             self.current_user = yield check_password(username, password)
         except LookupError:
@@ -179,7 +180,7 @@ class XmlRPC(BaseHandler):
 
     @coroutine
     def prepare(self):
-        if self.request.method.upper() == 'POST' and not self.request.body.startswith("\r\n"):
+        if self.request.method.upper() == 'POST' and not self.request.body.startswith(b("\r\n")):
             boundary = dict(
                 filter(
                     lambda x: x[0] == 'boundary',
@@ -194,19 +195,19 @@ def prepare(self):
                 raise HTTPError(400)
 
             def normalize(chunk):
-                if '\n\n' not in chunk:
-                    return '\r\n' + chunk[1:]
+                if b('\n\n') not in chunk:
+                    return b('\r\n') + chunk[1:]
 
-                ret = ''
-                ret += '\r\n'
-                data, content = chunk.split('\n\n', 1)
+                ret = b('')
+                ret += b('\r\n')
+                data, content = chunk.split(b('\n\n'), 1)
                 ret += data[1:]
-                ret += '\r\n\r\n'
+                ret += b('\r\n\r\n')
                 ret += content[:-1]
-                ret += '\r\n'
+                ret += b('\r\n')
                 return ret
 
-            boundary = "--{0}".format(boundary)
+            boundary = b("--{0}".format(boundary))
 
             new_body = boundary.join(
                 map(
@@ -216,7 +217,7 @@ def normalize(chunk):
             )
 
             new_body = new_body[:-4]
-            new_body += '--\r\n'
+            new_body += b('--\r\n')
 
             self.request.body = new_body
             self.request._parse_body()

setup.py

@@ -85,6 +85,7 @@ def walker(base, *paths):
         'bcrypt',
         'lxml',
         'futures',
+        'six',
     ),
     extras_require={
         'mysql': ['mysql-python'],