Vendoring update for 21.2 (#10179)

Author: uranusjr

src/pip/_vendor/distlib/__init__.py

@@ -6,7 +6,7 @@
 #
 import logging
 
-__version__ = '0.3.1'
+__version__ = '0.3.2'
 
 class DistlibException(Exception):
     pass

src/pip/_vendor/distlib/index.py

@@ -18,7 +18,7 @@
 from . import DistlibException
 from .compat import (HTTPBasicAuthHandler, Request, HTTPPasswordMgr,
                      urlparse, build_opener, string_types)
-from .util import cached_property, zip_dir, ServerProxy
+from .util import zip_dir, ServerProxy
 
 logger = logging.getLogger(__name__)
 
@@ -67,21 +67,17 @@ def _get_pypirc_command(self):
         Get the distutils command for interacting with PyPI configurations.
         :return: the command.
         """
-        from distutils.core import Distribution
-        from distutils.config import PyPIRCCommand
-        d = Distribution()
-        return PyPIRCCommand(d)
+        from .util import _get_pypirc_command as cmd
+        return cmd()
 
     def read_configuration(self):
         """
-        Read the PyPI access configuration as supported by distutils, getting
-        PyPI to do the actual work. This populates ``username``, ``password``,
-        ``realm`` and ``url`` attributes from the configuration.
+        Read the PyPI access configuration as supported by distutils. This populates
+        ``username``, ``password``, ``realm`` and ``url`` attributes from the
+        configuration.
         """
-        # get distutils to do the work
-        c = self._get_pypirc_command()
-        c.repository = self.url
-        cfg = c._read_pypirc()
+        from .util import _load_pypirc
+        cfg = _load_pypirc(self)
         self.username = cfg.get('username')
         self.password = cfg.get('password')
         self.realm = cfg.get('realm', 'pypi')
@@ -91,13 +87,10 @@ def save_configuration(self):
         """
         Save the PyPI access configuration. You must have set ``username`` and
         ``password`` attributes before calling this method.
-
-        Again, distutils is used to do the actual work.
         """
         self.check_credentials()
-        # get distutils to do the work
-        c = self._get_pypirc_command()
-        c._store_pypirc(self.username, self.password)
+        from .util import _store_pypirc
+        _store_pypirc(self)
 
     def check_credentials(self):
         """

src/pip/_vendor/distlib/locators.py

@@ -20,14 +20,14 @@
 
 from . import DistlibException
 from .compat import (urljoin, urlparse, urlunparse, url2pathname, pathname2url,
-                     queue, quote, unescape, string_types, build_opener,
+                     queue, quote, unescape, build_opener,
                      HTTPRedirectHandler as BaseRedirectHandler, text_type,
                      Request, HTTPError, URLError)
 from .database import Distribution, DistributionPath, make_dist
 from .metadata import Metadata, MetadataInvalidError
-from .util import (cached_property, parse_credentials, ensure_slash,
-                   split_filename, get_project_data, parse_requirement,
-                   parse_name_and_version, ServerProxy, normalize_name)
+from .util import (cached_property, ensure_slash, split_filename, get_project_data,
+                   parse_requirement, parse_name_and_version, ServerProxy,
+                   normalize_name)
 from .version import get_scheme, UnsupportedVersionError
 from .wheel import Wheel, is_compatible
 
@@ -378,13 +378,13 @@ def locate(self, requirement, prereleases=False):
                     continue
                 try:
                     if not matcher.match(k):
-                        logger.debug('%s did not match %r', matcher, k)
+                        pass  # logger.debug('%s did not match %r', matcher, k)
                     else:
                         if prereleases or not vcls(k).is_prerelease:
                             slist.append(k)
-                        else:
-                            logger.debug('skipping pre-release '
-                                         'version %s of %s', k, matcher.name)
+                        # else:
+                            # logger.debug('skipping pre-release '
+                                         # 'version %s of %s', k, matcher.name)
                 except Exception:  # pragma: no cover
                     logger.warning('error matching %s with %r', matcher, k)
                     pass # slist.append(k)
@@ -593,7 +593,7 @@ class SimpleScrapingLocator(Locator):
     # These are used to deal with various Content-Encoding schemes.
     decoders = {
         'deflate': zlib.decompress,
-        'gzip': lambda b: gzip.GzipFile(fileobj=BytesIO(d)).read(),
+        'gzip': lambda b: gzip.GzipFile(fileobj=BytesIO(b)).read(),
         'none': lambda b: b,
     }
 
@@ -1062,8 +1062,6 @@ def get_distribution_names(self):
 
 locate = default_locator.locate
 
-NAME_VERSION_RE = re.compile(r'(?P<name>[\w-]+)\s*'
-                             r'\(\s*(==\s*)?(?P<ver>[^)]+)\)$')
 
 class DependencyFinder(object):
     """

src/pip/_vendor/distlib/markers.py

@@ -15,9 +15,8 @@
 import os
 import sys
 import platform
-import re
 
-from .compat import python_implementation, urlparse, string_types
+from .compat import string_types
 from .util import in_venv, parse_marker
 
 __all__ = ['interpret']

src/pip/_vendor/distlib/metadata.py

@@ -94,8 +94,9 @@ class MetadataInvalidError(DistlibException):
 # See issue #106: Sometimes 'Requires' and 'Provides' occur wrongly in
 # the metadata. Include them in the tuple literal below to allow them
 # (for now).
+# Ditto for Obsoletes - see issue #140.
 _566_FIELDS = _426_FIELDS + ('Description-Content-Type',
-                             'Requires', 'Provides')
+                             'Requires', 'Provides', 'Obsoletes')
 
 _566_MARKERS = ('Description-Content-Type',)
 
@@ -117,7 +118,8 @@ def _version2fieldlist(version):
     elif version == '1.2':
         return _345_FIELDS
     elif version in ('1.3', '2.1'):
-        return _345_FIELDS + _566_FIELDS
+        # avoid adding field names if already there
+        return _345_FIELDS + tuple(f for f in _566_FIELDS if f not in _345_FIELDS)
     elif version == '2.0':
         return _426_FIELDS
     raise MetadataUnrecognizedVersionError(version)

src/pip/_vendor/distlib/resources.py

@@ -11,13 +11,12 @@
 import logging
 import os
 import pkgutil
-import shutil
 import sys
 import types
 import zipimport
 
 from . import DistlibException
-from .util import cached_property, get_cache_base, path_to_cache_dir, Cache
+from .util import cached_property, get_cache_base, Cache
 
 logger = logging.getLogger(__name__)
 
@@ -283,6 +282,7 @@ def _is_directory(self, path):
             result = False
         return result
 
+
 _finder_registry = {
     type(None): ResourceFinder,
     zipimport.zipimporter: ZipResourceFinder
@@ -296,6 +296,8 @@ def _is_directory(self, path):
         import _frozen_importlib as _fi
     _finder_registry[_fi.SourceFileLoader] = ResourceFinder
     _finder_registry[_fi.FileFinder] = ResourceFinder
+    # See issue #146
+    _finder_registry[_fi.SourcelessFileLoader] = ResourceFinder
     del _fi
 except (ImportError, AttributeError):
     pass
@@ -304,6 +306,7 @@ def _is_directory(self, path):
 def register_finder(loader, finder_maker):
     _finder_registry[type(loader)] = finder_maker
 
+
 _finder_cache = {}
 
 

src/pip/_vendor/distlib/scripts.py

@@ -282,6 +282,19 @@ def _write_script(self, names, shebang, script_bytes, filenames, ext):
                     self._fileop.set_executable_mode([outname])
             filenames.append(outname)
 
+    variant_separator = '-'
+
+    def get_script_filenames(self, name):
+        result = set()
+        if '' in self.variants:
+            result.add(name)
+        if 'X' in self.variants:
+            result.add('%s%s' % (name, self.version_info[0]))
+        if 'X.Y' in self.variants:
+            result.add('%s%s%s.%s' % (name, self.variant_separator,
+                                      self.version_info[0], self.version_info[1]))
+        return result
+
     def _make_script(self, entry, filenames, options=None):
         post_interp = b''
         if options:
@@ -291,15 +304,7 @@ def _make_script(self, entry, filenames, options=None):
                 post_interp = args.encode('utf-8')
         shebang = self._get_shebang('utf-8', post_interp, options=options)
         script = self._get_script_text(entry).encode('utf-8')
-        name = entry.name
-        scriptnames = set()
-        if '' in self.variants:
-            scriptnames.add(name)
-        if 'X' in self.variants:
-            scriptnames.add('%s%s' % (name, self.version_info[0]))
-        if 'X.Y' in self.variants:
-            scriptnames.add('%s-%s.%s' % (name, self.version_info[0],
-                                          self.version_info[1]))
+        scriptnames = self.get_script_filenames(entry.name)
         if options and options.get('gui', False):
             ext = 'pyw'
         else:
@@ -326,8 +331,7 @@ def _copy_script(self, script, filenames):
         else:
             first_line = f.readline()
             if not first_line:  # pragma: no cover
-                logger.warning('%s: %s is an empty file (skipping)',
-                               self.get_command_name(),  script)
+                logger.warning('%s is an empty file (skipping)', script)
                 return
 
             match = FIRST_LINE_RE.match(first_line.replace(b'\r\n', b'\n'))