diff options
Diffstat (limited to 'distutils2/command/upload_docs.py')
| -rw-r--r-- | distutils2/command/upload_docs.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/distutils2/command/upload_docs.py b/distutils2/command/upload_docs.py index 2f813d3..9e93fb5 100644 --- a/distutils2/command/upload_docs.py +++ b/distutils2/command/upload_docs.py @@ -5,9 +5,9 @@ import base64 import socket import zipfile import logging -import httplib -import urlparse -from StringIO import StringIO +import http.client +import urllib.parse +from io import BytesIO from distutils2 import logger from distutils2.util import (read_pypirc, DEFAULT_REPOSITORY, DEFAULT_REALM, @@ -18,7 +18,7 @@ from distutils2.command.cmd import Command def zip_dir(directory): """Compresses recursively contents of directory into a BytesIO object""" - destination = StringIO() + destination = BytesIO() zip_file = zipfile.ZipFile(destination, "w") try: for root, dirs, files in os.walk(directory): @@ -91,16 +91,16 @@ class upload_docs(Command): credentials = self.username + ':' + self.password # FIXME should use explicit encoding - auth = "Basic " + base64.encodestring(credentials.encode()).strip() + auth = b"Basic " + base64.encodebytes(credentials.encode()).strip() logger.info("Submitting documentation to %s", self.repository) - scheme, netloc, url, params, query, fragments = urlparse.urlparse( + scheme, netloc, url, params, query, fragments = urllib.parse.urlparse( self.repository) if scheme == "http": - conn = httplib.HTTPConnection(netloc) + conn = http.client.HTTPConnection(netloc) elif scheme == "https": - conn = httplib.HTTPSConnection(netloc) + conn = http.client.HTTPSConnection(netloc) else: raise AssertionError("unsupported scheme %r" % scheme) @@ -113,7 +113,7 @@ class upload_docs(Command): conn.endheaders() conn.send(body) - except socket.error, e: + except socket.error as e: logger.error(e) return |