Merge with mastersetuptools-scm

1 files changed, 6 insertions, 1 deletions

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 01b49046..269dc2d5 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -29,6 +29,10 @@ def _encode(s):
 
 
 class upload_docs(upload):
+    # override the default repository as upload_docs isn't
+    # supported by Warehouse (and won't be).
+    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi/'
+
     description = 'Upload documentation to PyPI'
 
     user_options = [
@@ -53,6 +57,7 @@ class upload_docs(upload):
         self.target_dir = None
 
     def finalize_options(self):
+        log.warn("Upload_docs command is deprecated. Use RTD instead.")
         upload.finalize_options(self)
         if self.upload_dir is None:
             if self.has_sphinx():
@@ -105,7 +110,7 @@ class upload_docs(upload):
         if not isinstance(values, list):
             values = [values]
         for value in values:
-            if type(value) is tuple:
+            if isinstance(value, tuple):
                 title += '; filename="%s"' % value[0]
                 value = value[1]
             else: