diff options
| -rw-r--r-- | CHANGES.txt | 8 | ||||
| -rw-r--r-- | setuptools/command/upload_docs.py | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index a7a70ab7..504281da 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,10 +2,16 @@ CHANGES ======= +20.1.1 +------ + +* Update ``upload_docs`` command to also honor keyring + for password resolution. + 20.1 ---- -Added support for using passwords from keyring in the upload +* Added support for using passwords from keyring in the upload command. See `the upload docs <http://pythonhosted.org/setuptools/setuptools.html#upload-upload-source-and-or-egg-distributions-to-pypi>`_ for details. 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' |