diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-12 11:10:53 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-12 11:10:53 -0500 |
commit | 076e6b32c38a5bd6141bf533ff87eb23e54eca67 (patch) | |
tree | 928c4ae8e25185ab70d2c0fe66f814132b3bc15a /setuptools/command/upload_docs.py | |
parent | 1e0ecae918c4c43f29b139b0dffa9d73b208e13b (diff) | |
download | python-setuptools-git-076e6b32c38a5bd6141bf533ff87eb23e54eca67.tar.gz |
Upload_docs should also resolve passwords from keyring same as upload command.
Diffstat (limited to 'setuptools/command/upload_docs.py')
-rw-r--r-- | setuptools/command/upload_docs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py index 0a57d5d3..f887b47e 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -8,7 +8,6 @@ PyPI's pythonhosted.org). from base64 import standard_b64encode from distutils import log from distutils.errors import DistutilsOptionError -from distutils.command.upload import upload import os import socket import zipfile @@ -19,6 +18,7 @@ from setuptools.extern import six from setuptools.extern.six.moves import http_client, urllib from pkg_resources import iter_entry_points +from .upload import upload errors = 'surrogateescape' if six.PY3 else 'strict' |