Skip to content

Commit f7b5479

Browse files
committed
Fix import paths after vendored pip update
To reproduce: find src/fetchcode/vcs/pip -type f -name '*.py'i \ -exec sed -i 's/from\ pip._/from\ fetchcode.vcs.pip._/g' {} + \ -exec sed -i 's/import\ pip._/import\ fetchcode.vcs.pip._/g' {} + \ -exec sed -i 's/"pip._/"fetchcode.vcs.pip._/g' {} + This is very similiar to what was done in: 8046215 Signed-off-by: TG1999 <tushar.goel.dav@gmail.com> Signed-off-by: Alexander Mazuruk <a.mazuruk@samsung.com>
1 parent c75ff01 commit f7b5479

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+186
-186
lines changed

src/fetchcode/vcs/pip/_internal/exceptions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
from itertools import chain, groupby, repeat
55
from typing import TYPE_CHECKING, Dict, List, Optional
66

7-
from pip._vendor.pkg_resources import Distribution
8-
from pip._vendor.requests.models import Request, Response
7+
from fetchcode.vcs.pip._vendor.pkg_resources import Distribution
8+
from fetchcode.vcs.pip._vendor.requests.models import Request, Response
99

1010
if TYPE_CHECKING:
1111
from hashlib import _Hash
1212

13-
from pip._internal.req.req_install import InstallRequirement
13+
from fetchcode.vcs.pip._internal.req.req_install import InstallRequirement
1414

1515

1616
class PipError(Exception):
@@ -287,7 +287,7 @@ def __init__(self, gotten_hash):
287287
def body(self):
288288
# type: () -> str
289289
# Dodge circular import.
290-
from pip._internal.utils.hashes import FAVORITE_HASH
290+
from fetchcode.vcs.pip._internal.utils.hashes import FAVORITE_HASH
291291

292292
package = None
293293
if self.req:

src/fetchcode/vcs/pip/_internal/utils/compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def has_tls() -> bool:
1919
except ImportError:
2020
pass
2121

22-
from pip._vendor.urllib3.util import IS_PYOPENSSL
22+
from fetchcode.vcs.pip._vendor.urllib3.util import IS_PYOPENSSL
2323

2424
return IS_PYOPENSSL
2525

src/fetchcode/vcs/pip/_internal/utils/deprecation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import warnings
77
from typing import Any, Optional, TextIO, Type, Union
88

9-
from pip._vendor.packaging.version import parse
9+
from fetchcode.vcs.pip._vendor.packaging.version import parse
1010

1111
from pip import __version__ as current_version
1212

@@ -35,7 +35,7 @@ def _showwarning(
3535
elif issubclass(category, PipDeprecationWarning):
3636
# We use a specially named logger which will handle all of the
3737
# deprecation messages for pip.
38-
logger = logging.getLogger("pip._internal.deprecations")
38+
logger = logging.getLogger("fetchcode.vcs.pip._internal.deprecations")
3939
logger.warning(message)
4040
else:
4141
_original_showwarning(message, category, filename, lineno, file, line)

src/fetchcode/vcs/pip/_internal/utils/logging.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
from logging import Filter
88
from typing import IO, Any, Callable, Iterator, Optional, TextIO, Type, cast
99

10-
from pip._internal.utils._log import VERBOSE, getLogger
11-
from pip._internal.utils.compat import WINDOWS
12-
from pip._internal.utils.deprecation import DEPRECATION_MSG_PREFIX
13-
from pip._internal.utils.misc import ensure_dir
10+
from fetchcode.vcs.pip._internal.utils._log import VERBOSE, getLogger
11+
from fetchcode.vcs.pip._internal.utils.compat import WINDOWS
12+
from fetchcode.vcs.pip._internal.utils.deprecation import DEPRECATION_MSG_PREFIX
13+
from fetchcode.vcs.pip._internal.utils.misc import ensure_dir
1414

1515
try:
1616
import threading
@@ -19,7 +19,7 @@
1919

2020

2121
try:
22-
from pip._vendor import colorama
22+
from fetchcode.vcs.pip._vendor import colorama
2323
# Lots of different errors can come from this, including SystemError and
2424
# ImportError.
2525
except Exception:
@@ -308,8 +308,8 @@ def setup_logging(verbosity, no_color, user_log_file):
308308
"stderr": "ext://sys.stderr",
309309
}
310310
handler_classes = {
311-
"stream": "pip._internal.utils.logging.ColorizedStreamHandler",
312-
"file": "pip._internal.utils.logging.BetterRotatingFileHandler",
311+
"stream": "fetchcode.vcs.pip._internal.utils.logging.ColorizedStreamHandler",
312+
"file": "fetchcode.vcs.pip._internal.utils.logging.BetterRotatingFileHandler",
313313
}
314314
handlers = ["console", "console_errors", "console_subprocess"] + (
315315
["user_log"] if include_user_log else []
@@ -321,15 +321,15 @@ def setup_logging(verbosity, no_color, user_log_file):
321321
"disable_existing_loggers": False,
322322
"filters": {
323323
"exclude_warnings": {
324-
"()": "pip._internal.utils.logging.MaxLevelFilter",
324+
"()": "fetchcode.vcs.pip._internal.utils.logging.MaxLevelFilter",
325325
"level": logging.WARNING,
326326
},
327327
"restrict_to_subprocess": {
328328
"()": "logging.Filter",
329329
"name": subprocess_logger.name,
330330
},
331331
"exclude_subprocess": {
332-
"()": "pip._internal.utils.logging.ExcludeLoggerFilter",
332+
"()": "fetchcode.vcs.pip._internal.utils.logging.ExcludeLoggerFilter",
333333
"name": subprocess_logger.name,
334334
},
335335
},
@@ -384,7 +384,7 @@ def setup_logging(verbosity, no_color, user_log_file):
384384
"level": root_level,
385385
"handlers": handlers,
386386
},
387-
"loggers": {"pip._vendor": {"level": vendored_log_level}},
387+
"loggers": {"fetchcode.vcs.pip._vendor": {"level": vendored_log_level}},
388388
}
389389
)
390390

src/fetchcode/vcs/pip/_internal/utils/misc.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
cast,
3535
)
3636

37-
from pip._vendor.pkg_resources import Distribution
38-
from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
37+
from fetchcode.vcs.pip._vendor.pkg_resources import Distribution
38+
from fetchcode.vcs.pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
3939

4040
from pip import __version__
41-
from pip._internal.exceptions import CommandError
42-
from pip._internal.locations import get_major_minor_version, site_packages, user_site
43-
from pip._internal.utils.compat import WINDOWS, stdlib_pkgs
44-
from pip._internal.utils.virtualenv import (
41+
from fetchcode.vcs.pip._internal.exceptions import CommandError
42+
from fetchcode.vcs.pip._internal.locations import get_major_minor_version, site_packages, user_site
43+
from fetchcode.vcs.pip._internal.utils.compat import WINDOWS, stdlib_pkgs
44+
from fetchcode.vcs.pip._internal.utils.virtualenv import (
4545
running_under_virtualenv,
4646
virtualenv_no_global,
4747
)
@@ -407,8 +407,8 @@ def get_installed_distributions(
407407
408408
Left for compatibility until direct pkg_resources uses are refactored out.
409409
"""
410-
from pip._internal.metadata import get_default_environment, get_environment
411-
from pip._internal.metadata.pkg_resources import Distribution as _Dist
410+
from fetchcode.vcs.pip._internal.metadata import get_default_environment, get_environment
411+
from fetchcode.vcs.pip._internal.metadata.pkg_resources import Distribution as _Dist
412412

413413
if paths is None:
414414
env = get_default_environment()
@@ -433,8 +433,8 @@ def get_distribution(req_name):
433433
434434
Left for compatibility until direct pkg_resources uses are refactored out.
435435
"""
436-
from pip._internal.metadata import get_default_environment
437-
from pip._internal.metadata.pkg_resources import Distribution as _Dist
436+
from fetchcode.vcs.pip._internal.metadata import get_default_environment
437+
from fetchcode.vcs.pip._internal.metadata.pkg_resources import Distribution as _Dist
438438

439439
dist = get_default_environment().get_distribution(req_name)
440440
if dist is None:

src/fetchcode/vcs/pip/_internal/utils/subprocess.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import subprocess
55
from typing import Any, Callable, Iterable, List, Mapping, Optional, Union
66

7-
from pip._internal.cli.spinners import SpinnerInterface, open_spinner
8-
from pip._internal.exceptions import InstallationSubprocessError
9-
from pip._internal.utils.logging import VERBOSE, subprocess_logger
10-
from pip._internal.utils.misc import HiddenText
7+
from fetchcode.vcs.pip._internal.cli.spinners import SpinnerInterface, open_spinner
8+
from fetchcode.vcs.pip._internal.exceptions import InstallationSubprocessError
9+
from fetchcode.vcs.pip._internal.utils.logging import VERBOSE, subprocess_logger
10+
from fetchcode.vcs.pip._internal.utils.misc import HiddenText
1111

1212
CommandArgs = List[Union[str, HiddenText]]
1313

src/fetchcode/vcs/pip/_internal/utils/temp_dir.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from contextlib import ExitStack, contextmanager
77
from typing import Any, Dict, Iterator, Optional, TypeVar, Union
88

9-
from pip._internal.utils.misc import enum, rmtree
9+
from fetchcode.vcs.pip._internal.utils.misc import enum, rmtree
1010

1111
logger = logging.getLogger(__name__)
1212

src/fetchcode/vcs/pip/_internal/vcs/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# the vcs package don't need to import deeper than `pip._internal.vcs`.
33
# (The test directory may still need to import from a vcs sub-package.)
44
# Import all vcs modules to register each VCS in the VcsSupport object.
5-
import pip._internal.vcs.bazaar
6-
import pip._internal.vcs.git
7-
import pip._internal.vcs.mercurial
8-
import pip._internal.vcs.subversion # noqa: F401
9-
from pip._internal.vcs.versioncontrol import ( # noqa: F401
5+
import fetchcode.vcs.pip._internal.vcs.bazaar
6+
import fetchcode.vcs.pip._internal.vcs.git
7+
import fetchcode.vcs.pip._internal.vcs.mercurial
8+
import fetchcode.vcs.pip._internal.vcs.subversion # noqa: F401
9+
from fetchcode.vcs.pip._internal.vcs.versioncontrol import ( # noqa: F401
1010
RemoteNotFoundError,
1111
RemoteNotValidError,
1212
is_url,

src/fetchcode/vcs/pip/_internal/vcs/bazaar.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import logging
22
from typing import List, Optional, Tuple
33

4-
from pip._internal.utils.misc import HiddenText, display_path
5-
from pip._internal.utils.subprocess import make_command
6-
from pip._internal.utils.urls import path_to_url
7-
from pip._internal.vcs.versioncontrol import (
4+
from fetchcode.vcs.pip._internal.utils.misc import HiddenText, display_path
5+
from fetchcode.vcs.pip._internal.utils.subprocess import make_command
6+
from fetchcode.vcs.pip._internal.utils.urls import path_to_url
7+
from fetchcode.vcs.pip._internal.vcs.versioncontrol import (
88
AuthInfo,
99
RemoteNotFoundError,
1010
RevOptions,

src/fetchcode/vcs/pip/_internal/vcs/git.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import urllib.request
77
from typing import List, Optional, Tuple
88

9-
from pip._internal.exceptions import BadCommand, InstallationError
10-
from pip._internal.utils.misc import HiddenText, display_path, hide_url
11-
from pip._internal.utils.subprocess import make_command
12-
from pip._internal.vcs.versioncontrol import (
9+
from fetchcode.vcs.pip._internal.exceptions import BadCommand, InstallationError
10+
from fetchcode.vcs.pip._internal.utils.misc import HiddenText, display_path, hide_url
11+
from fetchcode.vcs.pip._internal.utils.subprocess import make_command
12+
from fetchcode.vcs.pip._internal.vcs.versioncontrol import (
1313
AuthInfo,
1414
RemoteNotFoundError,
1515
RemoteNotValidError,

0 commit comments

Comments
 (0)