Upgrade distlib to 0.1.5

pypa · Dec 19, 2013 · 9e40899 · 9e40899
1 parent ea09ad5
commit 9e40899
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 9 deletions.
diff --git a/pip/_vendor/distlib/__init__.py b/pip/_vendor/distlib/__init__.py
@@ -6,7 +6,7 @@
 #
 import logging
 
-__version__ = '0.1.4'
+__version__ = '0.1.5'
 
 class DistlibException(Exception):
     pass

diff --git a/pip/_vendor/distlib/compat.py b/pip/_vendor/distlib/compat.py
@@ -420,7 +420,10 @@ def find_cookie(line):
     from html import escape
 except ImportError:
     from cgi import escape
-unescape = HTMLParser().unescape
+if sys.version_info[:2] < (3, 4):
+    unescape = HTMLParser().unescape
+else:
+    from html import unescape
 
 try:
     from collections import ChainMap

diff --git a/pip/_vendor/distlib/index.py b/pip/_vendor/distlib/index.py
@@ -10,7 +10,10 @@
 import shutil
 import subprocess
 import tempfile
-from threading import Thread
+try:
+    from threading import Thread
+except ImportError:
+    from dummy_threading import Thread
 
 from distlib import DistlibException
 from distlib.compat import (HTTPBasicAuthHandler, Request, HTTPPasswordMgr,
@@ -19,7 +22,7 @@
 
 logger = logging.getLogger(__name__)
 
-DEFAULT_INDEX = 'http://pypi.python.org/pypi'
+DEFAULT_INDEX = 'https://pypi.python.org/pypi'
 DEFAULT_REALM = 'pypi'
 
 class PackageIndex(object):
@@ -271,7 +274,6 @@ def upload_file(self, metadata, filename, signer=None, sign_password=None,
             files.append(('gpg_signature', os.path.basename(sig_file),
                          sig_data))
             shutil.rmtree(os.path.dirname(sig_file))
-        logger.debug('files: %s', files)
         request = self.encode_request(d.items(), files)
         return self.send_request(request)
 

diff --git a/pip/_vendor/distlib/locators.py b/pip/_vendor/distlib/locators.py
@@ -12,7 +12,10 @@
 import os
 import posixpath
 import re
-import threading
+try:
+    import threading
+except ImportError:
+    import dummy_threading as threading
 import zlib
 
 from . import DistlibException

diff --git a/pip/_vendor/distlib/scripts.py b/pip/_vendor/distlib/scripts.py
@@ -78,7 +78,8 @@ def __init__(self, source_dir, target_dir, add_launchers=True,
         self.add_launchers = add_launchers
         self.force = False
         self.clobber = False
-        self.set_mode = False
+        # It only makes sense to set mode bits on POSIX.
+        self.set_mode = (os.name == 'posix')
         self.variants = set(('', 'X.Y'))
         self._fileop = fileop or FileOperator(dry_run)
 

diff --git a/pip/_vendor/distlib/t32.exe b/pip/_vendor/distlib/t32.exe
diff --git a/pip/_vendor/distlib/t64.exe b/pip/_vendor/distlib/t64.exe
diff --git a/pip/_vendor/distlib/util.py b/pip/_vendor/distlib/util.py
@@ -20,7 +20,10 @@
 import sys
 import tarfile
 import tempfile
-import threading
+try:
+    import threading
+except ImportError:
+    import dummy_threading as threading
 import time
 
 from . import DistlibException

diff --git a/pip/_vendor/distlib/w32.exe b/pip/_vendor/distlib/w32.exe
diff --git a/pip/_vendor/distlib/w64.exe b/pip/_vendor/distlib/w64.exe
diff --git a/pip/_vendor/vendor.txt b/pip/_vendor/vendor.txt
@@ -1,4 +1,4 @@
-distlib==0.1.4
+distlib==0.1.5
 html5lib==1.0b1
 six==1.3.0
 colorama==0.2.7