diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 11:45:38 +0100 |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 11:45:38 +0100 |
| commit | e1a9b4dcc7b67e61b28fdefd33495ecc0fd7313b (patch) | |
| tree | f3434e338d7a1573cff64cc131b6cd32fdd3091e /setuptools/command/upload_docs.py | |
| parent | 1961cbe6164c403810e07f39c88c58241fac2d41 (diff) | |
| parent | 7834517bc7b158e4b85d6a4a4a425a2f4593d3db (diff) | |
| download | python-setuptools-bitbucket-e1a9b4dcc7b67e61b28fdefd33495ecc0fd7313b.tar.gz | |
Merged upstream changes.
Diffstat (limited to 'setuptools/command/upload_docs.py')
| -rw-r--r-- | setuptools/command/upload_docs.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py index e07b885d..12bc916b 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -25,7 +25,9 @@ except ImportError: from setuptools.compat import httplib, urlparse, unicode, iteritems -if sys.version_info >= (3,): +_IS_PYTHON3 = sys.version > '3' + +if _IS_PYTHON3: errors = 'surrogateescape' else: errors = 'strict' |