diff options
Diffstat (limited to 'setuptools/command/upload_docs.py')
| -rw-r--r-- | setuptools/command/upload_docs.py | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py index 12bc916b..8ee35cb0 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -17,20 +17,11 @@ from pkg_resources import iter_entry_points from distutils import log from distutils.errors import DistutilsOptionError +from distutils.command.upload import upload -try: - from distutils.command.upload import upload -except ImportError: - from setuptools.command.upload import upload +from setuptools.compat import httplib, urlparse, unicode, iteritems, PY3 -from setuptools.compat import httplib, urlparse, unicode, iteritems - -_IS_PYTHON3 = sys.version > '3' - -if _IS_PYTHON3: - errors = 'surrogateescape' -else: - errors = 'strict' +errors = 'surrogateescape' if PY3 else 'strict' # This is not just a replacement for byte literals @@ -124,7 +115,7 @@ class upload_docs(upload): # set up the authentication credentials = b(self.username + ':' + self.password) credentials = standard_b64encode(credentials) - if sys.version_info >= (3,): + if PY3: credentials = credentials.decode('ascii') auth = "Basic " + credentials @@ -136,7 +127,7 @@ class upload_docs(upload): for key, values in iteritems(data): title = '\nContent-Disposition: form-data; name="%s"' % key # handle multiple entries for the same name - if type(values) != type([]): + if isinstance(values, list): values = [values] for value in values: if type(value) is tuple: @@ -171,12 +162,11 @@ class upload_docs(upload): raise AssertionError("unsupported schema "+schema) data = '' - loglevel = log.INFO try: conn.connect() conn.putrequest("POST", url) - conn.putheader('Content-type', - 'multipart/form-data; boundary=%s'%boundary) + content_type = 'multipart/form-data; boundary=%s' % boundary + conn.putheader('Content-type', content_type) conn.putheader('Content-length', str(len(body))) conn.putheader('Authorization', auth) conn.endheaders() |