Merge pull request #4861 from pypa/fix/vendoring

Author: frostming

pipenv/patched/notpip/COPYING

@@ -15,7 +15,7 @@
     # __file__ is pip-*.whl/pip/__main__.py
     # first dirname call strips of '/__main__.py', second strips off '/pip'
     # Resulting path is the name of the wheel itself
-    # Add that to sys.path so we can import pipenv.patched.notpip
+    # Add that to sys.path so we can import pip
     path = os.path.dirname(os.path.dirname(__file__))
     sys.path.insert(0, path)
 

pipenv/patched/notpip/LICENSE

@@ -59,7 +59,7 @@ def main(args: Optional[List[str]] = None) -> int:
         sys.exit(1)
 
     # Needed for locale.getpreferredencoding(False) to work
-    # in pip._internal.utils.encoding.auto_decode
+    # in pipenv.patched.notpip._internal.utils.encoding.auto_decode
     try:
         locale.setlocale(locale.LC_ALL, "")
     except locale.Error as e:

pipenv/patched/notpip/LICENSE.APACHE

@@ -12,7 +12,7 @@
 
 # The ordering matters for help display.
 #    Also, even though the module path starts with the same
-# "pip._internal.commands" prefix in each case, we include the full path
+# "pipenv.patched.notpip._internal.commands" prefix in each case, we include the full path
 # because it makes testing easier (specifically when modifying commands_dict
 # in test setup / teardown by adding info for a FakeCommand class defined
 # in a test-related module).

pipenv/patched/notpip/LICENSE.BSD

@@ -59,12 +59,12 @@ def get_module_from_module_name(module_name: str) -> ModuleType:
         module_name = 'pkg_resources'
 
     __import__(
-        f'pip._vendor.{module_name}',
+        f'pipenv.patched.notpip._vendor.{module_name}',
         globals(),
         locals(),
         level=0
     )
-    return getattr(pip._vendor, module_name)
+    return getattr(pipenv.patched.notpip._vendor, module_name)
 
 
 def get_vendor_version_from_module(module_name: str) -> Optional[str]:
@@ -194,8 +194,8 @@ def run(self, options: Values, args: List[str]) -> int:
         show_value("'cert' config value", ca_bundle_info(self.parser.config))
         show_value("REQUESTS_CA_BUNDLE", os.environ.get('REQUESTS_CA_BUNDLE'))
         show_value("CURL_CA_BUNDLE", os.environ.get('CURL_CA_BUNDLE'))
-        show_value("pip._vendor.certifi.where()", where())
-        show_value("pip._vendor.DEBUNDLED", pip._vendor.DEBUNDLED)
+        show_value("pipenv.patched.notpip._vendor.certifi.where()", where())
+        show_value("pipenv.patched.notpip._vendor.DEBUNDLED", pipenv.patched.notpip._vendor.DEBUNDLED)
 
         show_vendor_versions()
 

pipenv/patched/notpip/LICENSE.md

@@ -32,7 +32,7 @@ class UninstallationError(PipError):
 class NoneMetadataError(PipError):
     """
     Raised when accessing "METADATA" or "PKG-INFO" metadata for a
-    pip._vendor.pkg_resources.Distribution object and
+    pipenv.patched.notpip._vendor.pkg_resources.Distribution object and
     `dist.has_metadata('METADATA')` returns True but
     `dist.get_metadata('METADATA')` returns None (and similarly for
     "PKG-INFO").

pipenv/patched/notpip/LICENSE.txt

@@ -891,7 +891,7 @@ def find_requirement(
 
         def _format_versions(cand_iter: Iterable[InstallationCandidate]) -> str:
             # This repeated parse_version and str() conversion is needed to
-            # handle different vendoring sources from pipenv.patched.notpip and pkg_resources.
+            # handle different vendoring sources from pip and pkg_resources.
             # If we stop using the pkg_resources provided specifier and start
             # using our own, we can drop the cast to str().
             return ", ".join(sorted(

pipenv/patched/notpip/__main__.py

@@ -32,7 +32,7 @@ def init_logging() -> None:
     """Register our VerboseLogger and VERBOSE log level.
 
     Should be called before any calls to getLogger(),
-    i.e. in pip._internal.__init__
+    i.e. in pipenv.patched.notpip._internal.__init__
     """
     logging.setLoggerClass(VerboseLogger)
     logging.addLevelName(VERBOSE, "VERBOSE")