[0-9]+(?:\.[0-9]+)*) # release segment
(?P # pre-release
[-_\.]?
- (?Palpha|a|beta|b|preview|pre|c|rc)
+ (?P(a|b|c|rc|alpha|beta|pre|preview))
[-_\.]?
(?P[0-9]+)?
)?
@@ -145,61 +253,17 @@ def __ne__(self, other: object) -> bool:
(?:\+(?P[a-z0-9]+(?:[-_\.][a-z0-9]+)*))? # local version
"""
-VERSION_PATTERN = _VERSION_PATTERN
-"""
-A string containing the regular expression used to match a valid version.
-
-The pattern is not anchored at either end, and is intended for embedding in larger
-expressions (for example, matching a version number as part of a file name). The
-regular expression should be compiled with the ``re.VERBOSE`` and ``re.IGNORECASE``
-flags set.
-
-:meta hide-value:
-"""
-
class Version(_BaseVersion):
- """This class abstracts handling of a project's versions.
-
- A :class:`Version` instance is comparison aware and can be compared and
- sorted using the standard Python interfaces.
-
- >>> v1 = Version("1.0a5")
- >>> v2 = Version("1.0")
- >>> v1
-
- >>> v2
-
- >>> v1 < v2
- True
- >>> v1 == v2
- False
- >>> v1 > v2
- False
- >>> v1 >= v2
- False
- >>> v1 <= v2
- True
- """
_regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
- _key: CmpKey
def __init__(self, version: str) -> None:
- """Initialize a Version object.
-
- :param version:
- The string representation of a version which will be parsed and normalized
- before use.
- :raises InvalidVersion:
- If the ``version`` does not conform to PEP 440 in any way then this
- exception will be raised.
- """
# Validate the version and parse it into pieces
match = self._regex.search(version)
if not match:
- raise InvalidVersion(f"Invalid version: {version!r}")
+ raise InvalidVersion(f"Invalid version: '{version}'")
# Store the parsed out pieces of the version
self._version = _Version(
@@ -224,19 +288,9 @@ def __init__(self, version: str) -> None:
)
def __repr__(self) -> str:
- """A representation of the Version that shows all internal state.
-
- >>> Version('1.0.0')
-
- """
return f""
def __str__(self) -> str:
- """A string representation of the version that can be round-tripped.
-
- >>> str(Version("1.0a5"))
- '1.0a5'
- """
parts = []
# Epoch
@@ -266,77 +320,29 @@ def __str__(self) -> str:
@property
def epoch(self) -> int:
- """The epoch of the version.
-
- >>> Version("2.0.0").epoch
- 0
- >>> Version("1!2.0.0").epoch
- 1
- """
- return self._version.epoch
+ _epoch: int = self._version.epoch
+ return _epoch
@property
- def release(self) -> tuple[int, ...]:
- """The components of the "release" segment of the version.
-
- >>> Version("1.2.3").release
- (1, 2, 3)
- >>> Version("2.0.0").release
- (2, 0, 0)
- >>> Version("1!2.0.0.post0").release
- (2, 0, 0)
-
- Includes trailing zeroes but not the epoch or any pre-release / development /
- post-release suffixes.
- """
- return self._version.release
+ def release(self) -> Tuple[int, ...]:
+ _release: Tuple[int, ...] = self._version.release
+ return _release
@property
- def pre(self) -> tuple[str, int] | None:
- """The pre-release segment of the version.
-
- >>> print(Version("1.2.3").pre)
- None
- >>> Version("1.2.3a1").pre
- ('a', 1)
- >>> Version("1.2.3b1").pre
- ('b', 1)
- >>> Version("1.2.3rc1").pre
- ('rc', 1)
- """
- return self._version.pre
+ def pre(self) -> Optional[Tuple[str, int]]:
+ _pre: Optional[Tuple[str, int]] = self._version.pre
+ return _pre
@property
- def post(self) -> int | None:
- """The post-release number of the version.
-
- >>> print(Version("1.2.3").post)
- None
- >>> Version("1.2.3.post1").post
- 1
- """
+ def post(self) -> Optional[int]:
return self._version.post[1] if self._version.post else None
@property
- def dev(self) -> int | None:
- """The development number of the version.
-
- >>> print(Version("1.2.3").dev)
- None
- >>> Version("1.2.3.dev1").dev
- 1
- """
+ def dev(self) -> Optional[int]:
return self._version.dev[1] if self._version.dev else None
@property
- def local(self) -> str | None:
- """The local version segment of the version.
-
- >>> print(Version("1.2.3").local)
- None
- >>> Version("1.2.3+abc").local
- 'abc'
- """
+ def local(self) -> Optional[str]:
if self._version.local:
return ".".join(str(x) for x in self._version.local)
else:
@@ -344,31 +350,10 @@ def local(self) -> str | None:
@property
def public(self) -> str:
- """The public portion of the version.
-
- >>> Version("1.2.3").public
- '1.2.3'
- >>> Version("1.2.3+abc").public
- '1.2.3'
- >>> Version("1!1.2.3dev1+abc").public
- '1!1.2.3.dev1'
- """
return str(self).split("+", 1)[0]
@property
def base_version(self) -> str:
- """The "base version" of the version.
-
- >>> Version("1.2.3").base_version
- '1.2.3'
- >>> Version("1.2.3+abc").base_version
- '1.2.3'
- >>> Version("1!1.2.3dev1+abc").base_version
- '1!1.2.3'
-
- The "base version" is the public version of the project without any pre or post
- release markers.
- """
parts = []
# Epoch
@@ -382,95 +367,33 @@ def base_version(self) -> str:
@property
def is_prerelease(self) -> bool:
- """Whether this version is a pre-release.
-
- >>> Version("1.2.3").is_prerelease
- False
- >>> Version("1.2.3a1").is_prerelease
- True
- >>> Version("1.2.3b1").is_prerelease
- True
- >>> Version("1.2.3rc1").is_prerelease
- True
- >>> Version("1.2.3dev1").is_prerelease
- True
- """
return self.dev is not None or self.pre is not None
@property
def is_postrelease(self) -> bool:
- """Whether this version is a post-release.
-
- >>> Version("1.2.3").is_postrelease
- False
- >>> Version("1.2.3.post1").is_postrelease
- True
- """
return self.post is not None
@property
def is_devrelease(self) -> bool:
- """Whether this version is a development release.
-
- >>> Version("1.2.3").is_devrelease
- False
- >>> Version("1.2.3.dev1").is_devrelease
- True
- """
return self.dev is not None
@property
def major(self) -> int:
- """The first item of :attr:`release` or ``0`` if unavailable.
-
- >>> Version("1.2.3").major
- 1
- """
return self.release[0] if len(self.release) >= 1 else 0
@property
def minor(self) -> int:
- """The second item of :attr:`release` or ``0`` if unavailable.
-
- >>> Version("1.2.3").minor
- 2
- >>> Version("1").minor
- 0
- """
return self.release[1] if len(self.release) >= 2 else 0
@property
def micro(self) -> int:
- """The third item of :attr:`release` or ``0`` if unavailable.
-
- >>> Version("1.2.3").micro
- 3
- >>> Version("1").micro
- 0
- """
return self.release[2] if len(self.release) >= 3 else 0
-class _TrimmedRelease(Version):
- @property
- def release(self) -> tuple[int, ...]:
- """
- Release segment without any trailing zeros.
-
- >>> _TrimmedRelease('1.0.0').release
- (1,)
- >>> _TrimmedRelease('0.0').release
- (0,)
- """
- rel = super().release
- nonzeros = (index for index, val in enumerate(rel) if val)
- last_nonzero = max(nonzeros, default=0)
- return rel[: last_nonzero + 1]
-
-
def _parse_letter_version(
- letter: str | None, number: str | bytes | SupportsInt | None
-) -> tuple[str, int] | None:
+ letter: str, number: Union[str, bytes, SupportsInt]
+) -> Optional[Tuple[str, int]]:
+
if letter:
# We consider there to be an implicit 0 in a pre-release if there is
# not a numeral associated with it.
@@ -493,9 +416,7 @@ def _parse_letter_version(
letter = "post"
return letter, int(number)
-
- assert not letter
- if number:
+ if not letter and number:
# We assume if we are given a number, but we are not given a letter
# then this is using the implicit post release syntax (e.g. 1.0-1)
letter = "post"
@@ -508,7 +429,7 @@ def _parse_letter_version(
_local_version_separators = re.compile(r"[\._-]")
-def _parse_local_version(local: str | None) -> LocalType | None:
+def _parse_local_version(local: str) -> Optional[LocalType]:
"""
Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
"""
@@ -522,12 +443,13 @@ def _parse_local_version(local: str | None) -> LocalType | None:
def _cmpkey(
epoch: int,
- release: tuple[int, ...],
- pre: tuple[str, int] | None,
- post: tuple[str, int] | None,
- dev: tuple[str, int] | None,
- local: LocalType | None,
+ release: Tuple[int, ...],
+ pre: Optional[Tuple[str, int]],
+ post: Optional[Tuple[str, int]],
+ dev: Optional[Tuple[str, int]],
+ local: Optional[Tuple[SubLocalType]],
) -> CmpKey:
+
# When we compare a release version, we want to compare it with all of the
# trailing zeros removed. So we'll use a reverse the list, drop all the now
# leading zeros until we come to something non zero, then take the rest
@@ -542,7 +464,7 @@ def _cmpkey(
# if there is not a pre or a post segment. If we have one of those then
# the normal sorting rules will handle this case correctly.
if pre is None and post is None and dev is not None:
- _pre: CmpPrePostDevType = NegativeInfinity
+ _pre: PrePostDevType = NegativeInfinity
# Versions without a pre-release (except as noted above) should sort after
# those with one.
elif pre is None:
@@ -552,21 +474,21 @@ def _cmpkey(
# Versions without a post segment should sort before those with one.
if post is None:
- _post: CmpPrePostDevType = NegativeInfinity
+ _post: PrePostDevType = NegativeInfinity
else:
_post = post
# Versions without a development segment should sort after those with one.
if dev is None:
- _dev: CmpPrePostDevType = Infinity
+ _dev: PrePostDevType = Infinity
else:
_dev = dev
if local is None:
# Versions without a local segment should sort before those with one.
- _local: CmpLocalType = NegativeInfinity
+ _local: LocalType = NegativeInfinity
else:
# Versions with a local segment need that segment parsed to implement
# the sorting rules in PEP440.
diff --git a/venv1/Lib/site-packages/pip/_vendor/pkg_resources/__init__.py b/venv1/Lib/site-packages/pip/_vendor/pkg_resources/__init__.py
index 72f2b035..1bf26a94 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pkg_resources/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pkg_resources/__init__.py
@@ -1,6 +1,3 @@
-# TODO: Add Generic type annotations to initialized collections.
-# For now we'd simply use implicit Any/Unknown which would add redundant annotations
-# mypy: disable-error-code="var-annotated"
"""
Package resource API
--------------------
@@ -16,40 +13,19 @@
.zip files and with custom PEP 302 loaders that support the ``get_data()``
method.
-This module is deprecated. Users are directed to :mod:`importlib.resources`,
-:mod:`importlib.metadata` and :pypi:`packaging` instead.
+This module is deprecated. Users are directed to
+`importlib.resources `_
+and
+`importlib.metadata `_
+instead.
"""
-from __future__ import annotations
-
import sys
-
-if sys.version_info < (3, 8): # noqa: UP036 # Check for unsupported versions
- raise RuntimeError("Python 3.8 or later is required")
-
import os
import io
import time
import re
import types
-from typing import (
- Any,
- Literal,
- Dict,
- Iterator,
- Mapping,
- MutableSequence,
- NamedTuple,
- NoReturn,
- Tuple,
- Union,
- TYPE_CHECKING,
- Protocol,
- Callable,
- Iterable,
- TypeVar,
- overload,
-)
import zipfile
import zipimport
import warnings
@@ -68,16 +44,21 @@
import ntpath
import posixpath
import importlib
-import importlib.abc
-import importlib.machinery
from pkgutil import get_importer
-import _imp
+try:
+ import _imp
+except ImportError:
+ # Python 3.2 compatibility
+ import imp as _imp
+
+try:
+ FileExistsError
+except NameError:
+ FileExistsError = OSError
# capture these to bypass sandboxing
from os import utime
-from os import open as os_open
-from os.path import isdir, split
try:
from os import mkdir, rename, unlink
@@ -87,57 +68,57 @@
# no write support, probably under GAE
WRITE_SUPPORT = False
+from os import open as os_open
+from os.path import isdir, split
+
+try:
+ import importlib.machinery as importlib_machinery
+
+ # access attribute to force import under delayed import mechanisms.
+ importlib_machinery.__name__
+except ImportError:
+ importlib_machinery = None
+
from pip._internal.utils._jaraco_text import (
yield_lines,
drop_comment,
join_continuation,
)
-from pip._vendor.packaging import markers as _packaging_markers
-from pip._vendor.packaging import requirements as _packaging_requirements
-from pip._vendor.packaging import utils as _packaging_utils
-from pip._vendor.packaging import version as _packaging_version
-from pip._vendor.platformdirs import user_cache_dir as _user_cache_dir
-
-if TYPE_CHECKING:
- from _typeshed import BytesPath, StrPath, StrOrBytesPath
- from typing_extensions import Self
-
-
-# Patch: Remove deprecation warning from vendored pkg_resources.
-# Setting PYTHONWARNINGS=error to verify builds produce no warnings
-# causes immediate exceptions.
-# See https://github.com/pypa/pip/issues/12243
-
-
-_T = TypeVar("_T")
-_DistributionT = TypeVar("_DistributionT", bound="Distribution")
-# Type aliases
-_NestedStr = Union[str, Iterable[Union[str, Iterable["_NestedStr"]]]]
-_InstallerTypeT = Callable[["Requirement"], "_DistributionT"]
-_InstallerType = Callable[["Requirement"], Union["Distribution", None]]
-_PkgReqType = Union[str, "Requirement"]
-_EPDistType = Union["Distribution", _PkgReqType]
-_MetadataType = Union["IResourceProvider", None]
-_ResolvedEntryPoint = Any # Can be any attribute in the module
-_ResourceStream = Any # TODO / Incomplete: A readable file-like object
-# Any object works, but let's indicate we expect something like a module (optionally has __loader__ or __file__)
-_ModuleLike = Union[object, types.ModuleType]
-# Any: Should be _ModuleLike but we end up with issues where _ModuleLike doesn't have _ZipLoaderModule's __loader__
-_ProviderFactoryType = Callable[[Any], "IResourceProvider"]
-_DistFinderType = Callable[[_T, str, bool], Iterable["Distribution"]]
-_NSHandlerType = Callable[[_T, str, str, types.ModuleType], Union[str, None]]
-_AdapterT = TypeVar(
- "_AdapterT", _DistFinderType[Any], _ProviderFactoryType, _NSHandlerType[Any]
-)
-
-# Use _typeshed.importlib.LoaderProtocol once available https://github.com/python/typeshed/pull/11890
-class _LoaderProtocol(Protocol):
- def load_module(self, fullname: str, /) -> types.ModuleType: ...
-
-
-class _ZipLoaderModule(Protocol):
- __loader__: zipimport.zipimporter
+from pip._vendor import platformdirs
+from pip._vendor import packaging
+
+__import__('pip._vendor.packaging.version')
+__import__('pip._vendor.packaging.specifiers')
+__import__('pip._vendor.packaging.requirements')
+__import__('pip._vendor.packaging.markers')
+__import__('pip._vendor.packaging.utils')
+
+if sys.version_info < (3, 5):
+ raise RuntimeError("Python 3.5 or later is required")
+
+# declare some globals that will be defined later to
+# satisfy the linters.
+require = None
+working_set = None
+add_activation_listener = None
+resources_stream = None
+cleanup_resources = None
+resource_dir = None
+resource_stream = None
+set_extraction_path = None
+resource_isdir = None
+resource_string = None
+iter_entry_points = None
+resource_listdir = None
+resource_filename = None
+resource_exists = None
+_distribution_finders = None
+_namespace_handlers = None
+_namespace_packages = None
+
+
+warnings.warn("pkg_resources is deprecated as an API", DeprecationWarning)
_PEP440_FALLBACK = re.compile(r"^v?(?P(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I)
@@ -150,18 +131,18 @@ class PEP440Warning(RuntimeWarning):
"""
-parse_version = _packaging_version.Version
+parse_version = packaging.version.Version
-_state_vars: dict[str, str] = {}
+_state_vars = {}
-def _declare_state(vartype: str, varname: str, initial_value: _T) -> _T:
- _state_vars[varname] = vartype
- return initial_value
+def _declare_state(vartype, **kw):
+ globals().update(kw)
+ _state_vars.update(dict.fromkeys(kw, vartype))
-def __getstate__() -> dict[str, Any]:
+def __getstate__():
state = {}
g = globals()
for k, v in _state_vars.items():
@@ -169,7 +150,7 @@ def __getstate__() -> dict[str, Any]:
return state
-def __setstate__(state: dict[str, Any]) -> dict[str, Any]:
+def __setstate__(state):
g = globals()
for k, v in state.items():
g['_sset_' + _state_vars[k]](k, g[k], v)
@@ -324,17 +305,17 @@ class VersionConflict(ResolutionError):
_template = "{self.dist} is installed but {self.req} is required"
@property
- def dist(self) -> Distribution:
+ def dist(self):
return self.args[0]
@property
- def req(self) -> Requirement:
+ def req(self):
return self.args[1]
def report(self):
return self._template.format(**locals())
- def with_context(self, required_by: set[Distribution | str]):
+ def with_context(self, required_by):
"""
If required_by is non-empty, return a version of self that is a
ContextualVersionConflict.
@@ -354,7 +335,7 @@ class ContextualVersionConflict(VersionConflict):
_template = VersionConflict._template + ' by {self.required_by}'
@property
- def required_by(self) -> set[str]:
+ def required_by(self):
return self.args[2]
@@ -367,11 +348,11 @@ class DistributionNotFound(ResolutionError):
)
@property
- def req(self) -> Requirement:
+ def req(self):
return self.args[0]
@property
- def requirers(self) -> set[str] | None:
+ def requirers(self):
return self.args[1]
@property
@@ -391,7 +372,7 @@ class UnknownExtra(ResolutionError):
"""Distribution doesn't have an "extra feature" of the given name"""
-_provider_factories: dict[type[_ModuleLike], _ProviderFactoryType] = {}
+_provider_factories = {}
PY_MAJOR = '{}.{}'.format(*sys.version_info)
EGG_DIST = 3
@@ -401,9 +382,7 @@ class UnknownExtra(ResolutionError):
DEVELOP_DIST = -1
-def register_loader_type(
- loader_type: type[_ModuleLike], provider_factory: _ProviderFactoryType
-):
+def register_loader_type(loader_type, provider_factory):
"""Register `provider_factory` to make providers for `loader_type`
`loader_type` is the type or class of a PEP 302 ``module.__loader__``,
@@ -413,11 +392,7 @@ def register_loader_type(
_provider_factories[loader_type] = provider_factory
-@overload
-def get_provider(moduleOrReq: str) -> IResourceProvider: ...
-@overload
-def get_provider(moduleOrReq: Requirement) -> Distribution: ...
-def get_provider(moduleOrReq: str | Requirement) -> IResourceProvider | Distribution:
+def get_provider(moduleOrReq):
"""Return an IResourceProvider for the named module or requirement"""
if isinstance(moduleOrReq, Requirement):
return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
@@ -430,18 +405,20 @@ def get_provider(moduleOrReq: str | Requirement) -> IResourceProvider | Distribu
return _find_adapter(_provider_factories, loader)(module)
-@functools.lru_cache(maxsize=None)
-def _macos_vers():
- version = platform.mac_ver()[0]
- # fallback for MacPorts
- if version == '':
- plist = '/System/Library/CoreServices/SystemVersion.plist'
- if os.path.exists(plist):
- with open(plist, 'rb') as fh:
- plist_content = plistlib.load(fh)
- if 'ProductVersion' in plist_content:
- version = plist_content['ProductVersion']
- return version.split('.')
+def _macos_vers(_cache=[]):
+ if not _cache:
+ version = platform.mac_ver()[0]
+ # fallback for MacPorts
+ if version == '':
+ plist = '/System/Library/CoreServices/SystemVersion.plist'
+ if os.path.exists(plist):
+ if hasattr(plistlib, 'readPlist'):
+ plist_content = plistlib.readPlist(plist)
+ if 'ProductVersion' in plist_content:
+ version = plist_content['ProductVersion']
+
+ _cache.append(version.split('.'))
+ return _cache[0]
def _macos_arch(machine):
@@ -479,7 +456,7 @@ def get_build_platform():
get_platform = get_build_platform
-def compatible_platforms(provided: str | None, required: str | None):
+def compatible_platforms(provided, required):
"""Can code for the `provided` platform run on the `required` platform?
Returns true if either platform is ``None``, or the platforms are equal.
@@ -528,106 +505,102 @@ def compatible_platforms(provided: str | None, required: str | None):
return False
-@overload
-def get_distribution(dist: _DistributionT) -> _DistributionT: ...
-@overload
-def get_distribution(dist: _PkgReqType) -> Distribution: ...
-def get_distribution(dist: Distribution | _PkgReqType) -> Distribution:
+def run_script(dist_spec, script_name):
+ """Locate distribution `dist_spec` and run its `script_name` script"""
+ ns = sys._getframe(1).f_globals
+ name = ns['__name__']
+ ns.clear()
+ ns['__name__'] = name
+ require(dist_spec)[0].run_script(script_name, ns)
+
+
+# backward compatibility
+run_main = run_script
+
+
+def get_distribution(dist):
"""Return a current distribution object for a Requirement or string"""
if isinstance(dist, str):
dist = Requirement.parse(dist)
if isinstance(dist, Requirement):
- # Bad type narrowing, dist has to be a Requirement here, so get_provider has to return Distribution
- dist = get_provider(dist) # type: ignore[assignment]
+ dist = get_provider(dist)
if not isinstance(dist, Distribution):
- raise TypeError("Expected str, Requirement, or Distribution", dist)
+ raise TypeError("Expected string, Requirement, or Distribution", dist)
return dist
-def load_entry_point(dist: _EPDistType, group: str, name: str) -> _ResolvedEntryPoint:
+def load_entry_point(dist, group, name):
"""Return `name` entry point of `group` for `dist` or raise ImportError"""
return get_distribution(dist).load_entry_point(group, name)
-@overload
-def get_entry_map(
- dist: _EPDistType, group: None = None
-) -> dict[str, dict[str, EntryPoint]]: ...
-@overload
-def get_entry_map(dist: _EPDistType, group: str) -> dict[str, EntryPoint]: ...
-def get_entry_map(dist: _EPDistType, group: str | None = None):
+def get_entry_map(dist, group=None):
"""Return the entry point map for `group`, or the full entry map"""
return get_distribution(dist).get_entry_map(group)
-def get_entry_info(dist: _EPDistType, group: str, name: str):
+def get_entry_info(dist, group, name):
"""Return the EntryPoint object for `group`+`name`, or ``None``"""
return get_distribution(dist).get_entry_info(group, name)
-class IMetadataProvider(Protocol):
- def has_metadata(self, name: str) -> bool:
+class IMetadataProvider:
+ def has_metadata(name):
"""Does the package's distribution contain the named metadata?"""
- def get_metadata(self, name: str) -> str:
+ def get_metadata(name):
"""The named metadata resource as a string"""
- def get_metadata_lines(self, name: str) -> Iterator[str]:
+ def get_metadata_lines(name):
"""Yield named metadata resource as list of non-blank non-comment lines
Leading and trailing whitespace is stripped from each line, and lines
with ``#`` as the first non-blank character are omitted."""
- def metadata_isdir(self, name: str) -> bool:
+ def metadata_isdir(name):
"""Is the named metadata a directory? (like ``os.path.isdir()``)"""
- def metadata_listdir(self, name: str) -> list[str]:
+ def metadata_listdir(name):
"""List of metadata names in the directory (like ``os.listdir()``)"""
- def run_script(self, script_name: str, namespace: dict[str, Any]) -> None:
+ def run_script(script_name, namespace):
"""Execute the named script in the supplied namespace dictionary"""
-class IResourceProvider(IMetadataProvider, Protocol):
+class IResourceProvider(IMetadataProvider):
"""An object that provides access to package resources"""
- def get_resource_filename(
- self, manager: ResourceManager, resource_name: str
- ) -> str:
+ def get_resource_filename(manager, resource_name):
"""Return a true filesystem path for `resource_name`
- `manager` must be a ``ResourceManager``"""
+ `manager` must be an ``IResourceManager``"""
- def get_resource_stream(
- self, manager: ResourceManager, resource_name: str
- ) -> _ResourceStream:
+ def get_resource_stream(manager, resource_name):
"""Return a readable file-like object for `resource_name`
- `manager` must be a ``ResourceManager``"""
+ `manager` must be an ``IResourceManager``"""
- def get_resource_string(
- self, manager: ResourceManager, resource_name: str
- ) -> bytes:
- """Return the contents of `resource_name` as :obj:`bytes`
+ def get_resource_string(manager, resource_name):
+ """Return a string containing the contents of `resource_name`
- `manager` must be a ``ResourceManager``"""
+ `manager` must be an ``IResourceManager``"""
- def has_resource(self, resource_name: str) -> bool:
+ def has_resource(resource_name):
"""Does the package contain the named resource?"""
- def resource_isdir(self, resource_name: str) -> bool:
+ def resource_isdir(resource_name):
"""Is the named resource a directory? (like ``os.path.isdir()``)"""
- def resource_listdir(self, resource_name: str) -> list[str]:
+ def resource_listdir(resource_name):
"""List of resource names in the directory (like ``os.listdir()``)"""
class WorkingSet:
"""A collection of active distributions on sys.path (or a similar list)"""
- def __init__(self, entries: Iterable[str] | None = None):
+ def __init__(self, entries=None):
"""Create working set from list of path entries (default=sys.path)"""
- self.entries: list[str] = []
+ self.entries = []
self.entry_keys = {}
self.by_key = {}
self.normalized_to_canonical_keys = {}
@@ -681,7 +654,7 @@ def _build_from_requirements(cls, req_spec):
sys.path[:] = ws.entries
return ws
- def add_entry(self, entry: str):
+ def add_entry(self, entry):
"""Add a path item to ``.entries``, finding any distributions on it
``find_distributions(entry, True)`` is used to find distributions
@@ -696,11 +669,11 @@ def add_entry(self, entry: str):
for dist in find_distributions(entry, True):
self.add(dist, entry, False)
- def __contains__(self, dist: Distribution) -> bool:
+ def __contains__(self, dist):
"""True if `dist` is the active distribution for its project"""
return self.by_key.get(dist.key) == dist
- def find(self, req: Requirement) -> Distribution | None:
+ def find(self, req):
"""Find a distribution matching requirement `req`
If there is an active distribution for the requested project, this
@@ -724,7 +697,7 @@ def find(self, req: Requirement) -> Distribution | None:
raise VersionConflict(dist, req)
return dist
- def iter_entry_points(self, group: str, name: str | None = None):
+ def iter_entry_points(self, group, name=None):
"""Yield entry point objects from `group` matching `name`
If `name` is None, yields all entry points in `group` from all
@@ -738,7 +711,7 @@ def iter_entry_points(self, group: str, name: str | None = None):
if name is None or name == entry.name
)
- def run_script(self, requires: str, script_name: str):
+ def run_script(self, requires, script_name):
"""Locate distribution for `requires` and run `script_name` script"""
ns = sys._getframe(1).f_globals
name = ns['__name__']
@@ -746,13 +719,13 @@ def run_script(self, requires: str, script_name: str):
ns['__name__'] = name
self.require(requires)[0].run_script(script_name, ns)
- def __iter__(self) -> Iterator[Distribution]:
+ def __iter__(self):
"""Yield distributions for non-duplicate projects in the working set
The yield order is the order in which the items' path entries were
added to the working set.
"""
- seen = set()
+ seen = {}
for item in self.entries:
if item not in self.entry_keys:
# workaround a cache issue
@@ -760,16 +733,10 @@ def __iter__(self) -> Iterator[Distribution]:
for key in self.entry_keys[item]:
if key not in seen:
- seen.add(key)
+ seen[key] = 1
yield self.by_key[key]
- def add(
- self,
- dist: Distribution,
- entry: str | None = None,
- insert: bool = True,
- replace: bool = False,
- ):
+ def add(self, dist, entry=None, insert=True, replace=False):
"""Add `dist` to working set, associated with `entry`
If `entry` is unspecified, it defaults to the ``.location`` of `dist`.
@@ -793,7 +760,7 @@ def add(
return
self.by_key[dist.key] = dist
- normalized_name = _packaging_utils.canonicalize_name(dist.key)
+ normalized_name = packaging.utils.canonicalize_name(dist.key)
self.normalized_to_canonical_keys[normalized_name] = dist.key
if dist.key not in keys:
keys.append(dist.key)
@@ -801,42 +768,14 @@ def add(
keys2.append(dist.key)
self._added_new(dist)
- @overload
- def resolve(
- self,
- requirements: Iterable[Requirement],
- env: Environment | None,
- installer: _InstallerTypeT[_DistributionT],
- replace_conflicting: bool = False,
- extras: tuple[str, ...] | None = None,
- ) -> list[_DistributionT]: ...
- @overload
- def resolve(
- self,
- requirements: Iterable[Requirement],
- env: Environment | None = None,
- *,
- installer: _InstallerTypeT[_DistributionT],
- replace_conflicting: bool = False,
- extras: tuple[str, ...] | None = None,
- ) -> list[_DistributionT]: ...
- @overload
- def resolve(
- self,
- requirements: Iterable[Requirement],
- env: Environment | None = None,
- installer: _InstallerType | None = None,
- replace_conflicting: bool = False,
- extras: tuple[str, ...] | None = None,
- ) -> list[Distribution]: ...
def resolve(
self,
- requirements: Iterable[Requirement],
- env: Environment | None = None,
- installer: _InstallerType | None | _InstallerTypeT[_DistributionT] = None,
- replace_conflicting: bool = False,
- extras: tuple[str, ...] | None = None,
- ) -> list[Distribution] | list[_DistributionT]:
+ requirements,
+ env=None,
+ installer=None,
+ replace_conflicting=False,
+ extras=None,
+ ):
"""List all distributions needed to (recursively) meet `requirements`
`requirements` must be a sequence of ``Requirement`` objects. `env`,
@@ -864,7 +803,7 @@ def resolve(
# set up the stack
requirements = list(requirements)[::-1]
# set of processed requirements
- processed = set()
+ processed = {}
# key -> dist
best = {}
to_activate = []
@@ -898,14 +837,14 @@ def resolve(
required_by[new_requirement].add(req.project_name)
req_extras[new_requirement] = req.extras
- processed.add(req)
+ processed[req] = True
# return list of distros to activate
return to_activate
def _resolve_dist(
self, req, best, replace_conflicting, env, installer, required_by, to_activate
- ) -> Distribution:
+ ):
dist = best.get(req.key)
if dist is None:
# Find the best distribution and add it to the map
@@ -934,41 +873,7 @@ def _resolve_dist(
raise VersionConflict(dist, req).with_context(dependent_req)
return dist
- @overload
- def find_plugins(
- self,
- plugin_env: Environment,
- full_env: Environment | None,
- installer: _InstallerTypeT[_DistributionT],
- fallback: bool = True,
- ) -> tuple[list[_DistributionT], dict[Distribution, Exception]]: ...
- @overload
- def find_plugins(
- self,
- plugin_env: Environment,
- full_env: Environment | None = None,
- *,
- installer: _InstallerTypeT[_DistributionT],
- fallback: bool = True,
- ) -> tuple[list[_DistributionT], dict[Distribution, Exception]]: ...
- @overload
- def find_plugins(
- self,
- plugin_env: Environment,
- full_env: Environment | None = None,
- installer: _InstallerType | None = None,
- fallback: bool = True,
- ) -> tuple[list[Distribution], dict[Distribution, Exception]]: ...
- def find_plugins(
- self,
- plugin_env: Environment,
- full_env: Environment | None = None,
- installer: _InstallerType | None | _InstallerTypeT[_DistributionT] = None,
- fallback: bool = True,
- ) -> tuple[
- list[Distribution] | list[_DistributionT],
- dict[Distribution, Exception],
- ]:
+ def find_plugins(self, plugin_env, full_env=None, installer=None, fallback=True):
"""Find all activatable distributions in `plugin_env`
Example usage::
@@ -1007,8 +912,8 @@ def find_plugins(
# scan project names in alphabetic order
plugin_projects.sort()
- error_info: dict[Distribution, Exception] = {}
- distributions: dict[Distribution, Exception | None] = {}
+ error_info = {}
+ distributions = {}
if full_env is None:
env = Environment(self.entries)
@@ -1044,12 +949,12 @@ def find_plugins(
# success, no need to try any more versions of this project
break
- sorted_distributions = list(distributions)
- sorted_distributions.sort()
+ distributions = list(distributions)
+ distributions.sort()
- return sorted_distributions, error_info
+ return distributions, error_info
- def require(self, *requirements: _NestedStr):
+ def require(self, *requirements):
"""Ensure that distributions matching `requirements` are activated
`requirements` must be a string or a (possibly-nested) sequence
@@ -1065,9 +970,7 @@ def require(self, *requirements: _NestedStr):
return needed
- def subscribe(
- self, callback: Callable[[Distribution], object], existing: bool = True
- ):
+ def subscribe(self, callback, existing=True):
"""Invoke `callback` for all distributions
If `existing=True` (default),
@@ -1103,12 +1006,12 @@ def __setstate__(self, e_k_b_n_c):
self.callbacks = callbacks[:]
-class _ReqExtras(Dict["Requirement", Tuple[str, ...]]):
+class _ReqExtras(dict):
"""
Map each requirement to the extras that demanded it.
"""
- def markers_pass(self, req: Requirement, extras: tuple[str, ...] | None = None):
+ def markers_pass(self, req, extras=None):
"""
Evaluate markers for req against each extra that
demanded it.
@@ -1127,10 +1030,7 @@ class Environment:
"""Searchable snapshot of distributions on a search path"""
def __init__(
- self,
- search_path: Iterable[str] | None = None,
- platform: str | None = get_supported_platform(),
- python: str | None = PY_MAJOR,
+ self, search_path=None, platform=get_supported_platform(), python=PY_MAJOR
):
"""Snapshot distributions available on a search path
@@ -1153,7 +1053,7 @@ def __init__(
self.python = python
self.scan(search_path)
- def can_add(self, dist: Distribution):
+ def can_add(self, dist):
"""Is distribution `dist` acceptable for this environment?
The distribution must match the platform and python version
@@ -1167,11 +1067,11 @@ def can_add(self, dist: Distribution):
)
return py_compat and compatible_platforms(dist.platform, self.platform)
- def remove(self, dist: Distribution):
+ def remove(self, dist):
"""Remove `dist` from the environment"""
self._distmap[dist.key].remove(dist)
- def scan(self, search_path: Iterable[str] | None = None):
+ def scan(self, search_path=None):
"""Scan `search_path` for distributions usable in this environment
Any distributions found are added to the environment.
@@ -1186,7 +1086,7 @@ def scan(self, search_path: Iterable[str] | None = None):
for dist in find_distributions(item):
self.add(dist)
- def __getitem__(self, project_name: str) -> list[Distribution]:
+ def __getitem__(self, project_name):
"""Return a newest-to-oldest list of distributions for `project_name`
Uses case-insensitive `project_name` comparison, assuming all the
@@ -1197,7 +1097,7 @@ def __getitem__(self, project_name: str) -> list[Distribution]:
distribution_key = project_name.lower()
return self._distmap.get(distribution_key, [])
- def add(self, dist: Distribution):
+ def add(self, dist):
"""Add `dist` if we ``can_add()`` it and it has not already been added"""
if self.can_add(dist) and dist.has_version():
dists = self._distmap.setdefault(dist.key, [])
@@ -1205,29 +1105,7 @@ def add(self, dist: Distribution):
dists.append(dist)
dists.sort(key=operator.attrgetter('hashcmp'), reverse=True)
- @overload
- def best_match(
- self,
- req: Requirement,
- working_set: WorkingSet,
- installer: _InstallerTypeT[_DistributionT],
- replace_conflicting: bool = False,
- ) -> _DistributionT: ...
- @overload
- def best_match(
- self,
- req: Requirement,
- working_set: WorkingSet,
- installer: _InstallerType | None = None,
- replace_conflicting: bool = False,
- ) -> Distribution | None: ...
- def best_match(
- self,
- req: Requirement,
- working_set: WorkingSet,
- installer: _InstallerType | None | _InstallerTypeT[_DistributionT] = None,
- replace_conflicting: bool = False,
- ) -> Distribution | None:
+ def best_match(self, req, working_set, installer=None, replace_conflicting=False):
"""Find distribution best matching `req` and usable on `working_set`
This calls the ``find(req)`` method of the `working_set` to see if a
@@ -1254,32 +1132,7 @@ def best_match(
# try to download/install
return self.obtain(req, installer)
- @overload
- def obtain(
- self,
- requirement: Requirement,
- installer: _InstallerTypeT[_DistributionT],
- ) -> _DistributionT: ...
- @overload
- def obtain(
- self,
- requirement: Requirement,
- installer: Callable[[Requirement], None] | None = None,
- ) -> None: ...
- @overload
- def obtain(
- self,
- requirement: Requirement,
- installer: _InstallerType | None = None,
- ) -> Distribution | None: ...
- def obtain(
- self,
- requirement: Requirement,
- installer: Callable[[Requirement], None]
- | _InstallerType
- | None
- | _InstallerTypeT[_DistributionT] = None,
- ) -> Distribution | None:
+ def obtain(self, requirement, installer=None):
"""Obtain a distribution matching `requirement` (e.g. via download)
Obtain a distro that matches requirement (e.g. via download). In the
@@ -1288,15 +1141,16 @@ def obtain(
None is returned instead. This method is a hook that allows subclasses
to attempt other ways of obtaining a distribution before falling back
to the `installer` argument."""
- return installer(requirement) if installer else None
+ if installer is not None:
+ return installer(requirement)
- def __iter__(self) -> Iterator[str]:
+ def __iter__(self):
"""Yield the unique project names of the available distributions"""
for key in self._distmap.keys():
if self[key]:
yield key
- def __iadd__(self, other: Distribution | Environment):
+ def __iadd__(self, other):
"""In-place addition of a distribution or environment"""
if isinstance(other, Distribution):
self.add(other)
@@ -1308,7 +1162,7 @@ def __iadd__(self, other: Distribution | Environment):
raise TypeError("Can't add %r to environment" % (other,))
return self
- def __add__(self, other: Distribution | Environment):
+ def __add__(self, other):
"""Add an environment or distribution to an environment"""
new = self.__class__([], platform=None, python=None)
for env in self, other:
@@ -1335,54 +1189,46 @@ class ExtractionError(RuntimeError):
The exception instance that caused extraction to fail
"""
- manager: ResourceManager
- cache_path: str
- original_error: BaseException | None
-
class ResourceManager:
"""Manage resource extraction and packages"""
- extraction_path: str | None = None
+ extraction_path = None
def __init__(self):
self.cached_files = {}
- def resource_exists(self, package_or_requirement: _PkgReqType, resource_name: str):
+ def resource_exists(self, package_or_requirement, resource_name):
"""Does the named resource exist?"""
return get_provider(package_or_requirement).has_resource(resource_name)
- def resource_isdir(self, package_or_requirement: _PkgReqType, resource_name: str):
+ def resource_isdir(self, package_or_requirement, resource_name):
"""Is the named resource an existing directory?"""
return get_provider(package_or_requirement).resource_isdir(resource_name)
- def resource_filename(
- self, package_or_requirement: _PkgReqType, resource_name: str
- ):
+ def resource_filename(self, package_or_requirement, resource_name):
"""Return a true filesystem path for specified resource"""
return get_provider(package_or_requirement).get_resource_filename(
self, resource_name
)
- def resource_stream(self, package_or_requirement: _PkgReqType, resource_name: str):
+ def resource_stream(self, package_or_requirement, resource_name):
"""Return a readable file-like object for specified resource"""
return get_provider(package_or_requirement).get_resource_stream(
self, resource_name
)
- def resource_string(
- self, package_or_requirement: _PkgReqType, resource_name: str
- ) -> bytes:
- """Return specified resource as :obj:`bytes`"""
+ def resource_string(self, package_or_requirement, resource_name):
+ """Return specified resource as a string"""
return get_provider(package_or_requirement).get_resource_string(
self, resource_name
)
- def resource_listdir(self, package_or_requirement: _PkgReqType, resource_name: str):
+ def resource_listdir(self, package_or_requirement, resource_name):
"""List the contents of the named resource directory"""
return get_provider(package_or_requirement).resource_listdir(resource_name)
- def extraction_error(self) -> NoReturn:
+ def extraction_error(self):
"""Give an error message for problems extracting file(s)"""
old_exc = sys.exc_info()[1]
@@ -1412,7 +1258,7 @@ def extraction_error(self) -> NoReturn:
err.original_error = old_exc
raise err
- def get_cache_path(self, archive_name: str, names: Iterable[StrPath] = ()):
+ def get_cache_path(self, archive_name, names=()):
"""Return absolute location in cache for `archive_name` and `names`
The parent directory of the resulting path will be created if it does
@@ -1434,7 +1280,7 @@ def get_cache_path(self, archive_name: str, names: Iterable[StrPath] = ()):
self._warn_unsafe_extraction_path(extract_path)
- self.cached_files[target_path] = True
+ self.cached_files[target_path] = 1
return target_path
@staticmethod
@@ -1464,7 +1310,7 @@ def _warn_unsafe_extraction_path(path):
).format(**locals())
warnings.warn(msg, UserWarning)
- def postprocess(self, tempname: StrOrBytesPath, filename: StrOrBytesPath):
+ def postprocess(self, tempname, filename):
"""Perform any platform-specific postprocessing of `tempname`
This is where Mac header rewrites should be done; other platforms don't
@@ -1484,7 +1330,7 @@ def postprocess(self, tempname: StrOrBytesPath, filename: StrOrBytesPath):
mode = ((os.stat(tempname).st_mode) | 0o555) & 0o7777
os.chmod(tempname, mode)
- def set_extraction_path(self, path: str):
+ def set_extraction_path(self, path):
"""Set the base path where resources will be extracted to, if needed.
If you do not call this routine before any extractions take place, the
@@ -1508,7 +1354,7 @@ def set_extraction_path(self, path: str):
self.extraction_path = path
- def cleanup_resources(self, force: bool = False) -> list[str]:
+ def cleanup_resources(self, force=False):
"""
Delete all extracted resource files and directories, returning a list
of the file and directory names that could not be successfully removed.
@@ -1520,19 +1366,20 @@ def cleanup_resources(self, force: bool = False) -> list[str]:
directory used for extractions.
"""
# XXX
- return []
-def get_default_cache() -> str:
+def get_default_cache():
"""
Return the ``PYTHON_EGG_CACHE`` environment variable
or a platform-relevant user cache dir for an app
named "Python-Eggs".
"""
- return os.environ.get('PYTHON_EGG_CACHE') or _user_cache_dir(appname='Python-Eggs')
+ return os.environ.get('PYTHON_EGG_CACHE') or platformdirs.user_cache_dir(
+ appname='Python-Eggs'
+ )
-def safe_name(name: str):
+def safe_name(name):
"""Convert an arbitrary string to a standard distribution name
Any runs of non-alphanumeric/. characters are replaced with a single '-'.
@@ -1540,14 +1387,14 @@ def safe_name(name: str):
return re.sub('[^A-Za-z0-9.]+', '-', name)
-def safe_version(version: str):
+def safe_version(version):
"""
Convert an arbitrary string to a standard version string
"""
try:
# normalize the version
- return str(_packaging_version.Version(version))
- except _packaging_version.InvalidVersion:
+ return str(packaging.version.Version(version))
+ except packaging.version.InvalidVersion:
version = version.replace(' ', '.')
return re.sub('[^A-Za-z0-9.]+', '-', version)
@@ -1569,7 +1416,7 @@ def _forgiving_version(version):
match = _PEP440_FALLBACK.search(version)
if match:
safe = match["safe"]
- rest = version[len(safe) :]
+ rest = version[len(safe):]
else:
safe = "0"
rest = version
@@ -1584,7 +1431,7 @@ def _safe_segment(segment):
return re.sub(r'\.[^A-Za-z0-9]+', '.', segment).strip(".-")
-def safe_extra(extra: str):
+def safe_extra(extra):
"""Convert an arbitrary string to a standard 'extra' name
Any runs of non-alphanumeric characters are replaced with a single '_',
@@ -1593,7 +1440,7 @@ def safe_extra(extra: str):
return re.sub('[^A-Za-z0-9.-]+', '_', extra).lower()
-def to_filename(name: str):
+def to_filename(name):
"""Convert a project or version name to its filename-escaped form
Any '-' characters are currently replaced with '_'.
@@ -1601,7 +1448,7 @@ def to_filename(name: str):
return name.replace('-', '_')
-def invalid_marker(text: str):
+def invalid_marker(text):
"""
Validate text as a PEP 508 environment marker; return an exception
if invalid or False otherwise.
@@ -1615,7 +1462,7 @@ def invalid_marker(text: str):
return False
-def evaluate_marker(text: str, extra: str | None = None) -> bool:
+def evaluate_marker(text, extra=None):
"""
Evaluate a PEP 508 environment marker.
Return a boolean indicating the marker result in this environment.
@@ -1624,48 +1471,46 @@ def evaluate_marker(text: str, extra: str | None = None) -> bool:
This implementation uses the 'pyparsing' module.
"""
try:
- marker = _packaging_markers.Marker(text)
+ marker = packaging.markers.Marker(text)
return marker.evaluate()
- except _packaging_markers.InvalidMarker as e:
+ except packaging.markers.InvalidMarker as e:
raise SyntaxError(e) from e
class NullProvider:
"""Try to implement resources and metadata for arbitrary PEP 302 loaders"""
- egg_name: str | None = None
- egg_info: str | None = None
- loader: _LoaderProtocol | None = None
+ egg_name = None
+ egg_info = None
+ loader = None
- def __init__(self, module: _ModuleLike):
+ def __init__(self, module):
self.loader = getattr(module, '__loader__', None)
self.module_path = os.path.dirname(getattr(module, '__file__', ''))
- def get_resource_filename(self, manager: ResourceManager, resource_name: str):
+ def get_resource_filename(self, manager, resource_name):
return self._fn(self.module_path, resource_name)
- def get_resource_stream(self, manager: ResourceManager, resource_name: str):
+ def get_resource_stream(self, manager, resource_name):
return io.BytesIO(self.get_resource_string(manager, resource_name))
- def get_resource_string(
- self, manager: ResourceManager, resource_name: str
- ) -> bytes:
+ def get_resource_string(self, manager, resource_name):
return self._get(self._fn(self.module_path, resource_name))
- def has_resource(self, resource_name: str):
+ def has_resource(self, resource_name):
return self._has(self._fn(self.module_path, resource_name))
def _get_metadata_path(self, name):
return self._fn(self.egg_info, name)
- def has_metadata(self, name: str) -> bool:
+ def has_metadata(self, name):
if not self.egg_info:
- return False
+ return self.egg_info
path = self._get_metadata_path(name)
return self._has(path)
- def get_metadata(self, name: str):
+ def get_metadata(self, name):
if not self.egg_info:
return ""
path = self._get_metadata_path(name)
@@ -1678,24 +1523,24 @@ def get_metadata(self, name: str):
exc.reason += ' in {} file at path: {}'.format(name, path)
raise
- def get_metadata_lines(self, name: str) -> Iterator[str]:
+ def get_metadata_lines(self, name):
return yield_lines(self.get_metadata(name))
- def resource_isdir(self, resource_name: str):
+ def resource_isdir(self, resource_name):
return self._isdir(self._fn(self.module_path, resource_name))
- def metadata_isdir(self, name: str) -> bool:
- return bool(self.egg_info and self._isdir(self._fn(self.egg_info, name)))
+ def metadata_isdir(self, name):
+ return self.egg_info and self._isdir(self._fn(self.egg_info, name))
- def resource_listdir(self, resource_name: str):
+ def resource_listdir(self, resource_name):
return self._listdir(self._fn(self.module_path, resource_name))
- def metadata_listdir(self, name: str) -> list[str]:
+ def metadata_listdir(self, name):
if self.egg_info:
return self._listdir(self._fn(self.egg_info, name))
return []
- def run_script(self, script_name: str, namespace: dict[str, Any]):
+ def run_script(self, script_name, namespace):
script = 'scripts/' + script_name
if not self.has_metadata(script):
raise ResolutionError(
@@ -1703,13 +1548,13 @@ def run_script(self, script_name: str, namespace: dict[str, Any]):
**locals()
),
)
-
script_text = self.get_metadata(script).replace('\r\n', '\n')
script_text = script_text.replace('\r', '\n')
script_filename = self._fn(self.egg_info, script)
namespace['__file__'] = script_filename
if os.path.exists(script_filename):
- source = _read_utf8_with_fallback(script_filename)
+ with open(script_filename) as fid:
+ source = fid.read()
code = compile(source, script_filename, 'exec')
exec(code, namespace, namespace)
else:
@@ -1724,26 +1569,22 @@ def run_script(self, script_name: str, namespace: dict[str, Any]):
script_code = compile(script_text, script_filename, 'exec')
exec(script_code, namespace, namespace)
- def _has(self, path) -> bool:
+ def _has(self, path):
raise NotImplementedError(
"Can't perform this operation for unregistered loader type"
)
- def _isdir(self, path) -> bool:
+ def _isdir(self, path):
raise NotImplementedError(
"Can't perform this operation for unregistered loader type"
)
- def _listdir(self, path) -> list[str]:
+ def _listdir(self, path):
raise NotImplementedError(
"Can't perform this operation for unregistered loader type"
)
- def _fn(self, base: str | None, resource_name: str):
- if base is None:
- raise TypeError(
- "`base` parameter in `_fn` is `None`. Either override this method or check the parameter first."
- )
+ def _fn(self, base, resource_name):
self._validate_resource_path(resource_name)
if resource_name:
return os.path.join(base, *resource_name.split('/'))
@@ -1806,7 +1647,6 @@ def _validate_resource_path(path):
os.path.pardir in path.split(posixpath.sep)
or posixpath.isabs(path)
or ntpath.isabs(path)
- or path.startswith("\\")
)
if not invalid:
return
@@ -1814,20 +1654,20 @@ def _validate_resource_path(path):
msg = "Use of .. or absolute path in a resource path is not allowed."
# Aggressively disallow Windows absolute paths
- if (path.startswith("\\") or ntpath.isabs(path)) and not posixpath.isabs(path):
+ if ntpath.isabs(path) and not posixpath.isabs(path):
raise ValueError(msg)
# for compatibility, warn; in future
# raise ValueError(msg)
- issue_warning(
+ warnings.warn(
msg[:-1] + " and will raise exceptions in a future release.",
DeprecationWarning,
+ stacklevel=4,
)
- def _get(self, path) -> bytes:
- if hasattr(self.loader, 'get_data') and self.loader:
- # Already checked get_data exists
- return self.loader.get_data(path) # type: ignore[attr-defined]
+ def _get(self, path):
+ if hasattr(self.loader, 'get_data'):
+ return self.loader.get_data(path)
raise NotImplementedError(
"Can't perform this operation for loaders without 'get_data()'"
)
@@ -1850,7 +1690,7 @@ def _parents(path):
class EggProvider(NullProvider):
"""Provider based on a virtual filesystem"""
- def __init__(self, module: _ModuleLike):
+ def __init__(self, module):
super().__init__(module)
self._setup_prefix()
@@ -1861,7 +1701,7 @@ def _setup_prefix(self):
egg = next(eggs, None)
egg and self._set_egg(egg)
- def _set_egg(self, path: str):
+ def _set_egg(self, path):
self.egg_name = os.path.basename(path)
self.egg_info = os.path.join(path, 'EGG-INFO')
self.egg_root = path
@@ -1870,19 +1710,19 @@ def _set_egg(self, path: str):
class DefaultProvider(EggProvider):
"""Provides access to package resources in the filesystem"""
- def _has(self, path) -> bool:
+ def _has(self, path):
return os.path.exists(path)
- def _isdir(self, path) -> bool:
+ def _isdir(self, path):
return os.path.isdir(path)
def _listdir(self, path):
return os.listdir(path)
- def get_resource_stream(self, manager: object, resource_name: str):
+ def get_resource_stream(self, manager, resource_name):
return open(self._fn(self.module_path, resource_name), 'rb')
- def _get(self, path) -> bytes:
+ def _get(self, path):
with open(path, 'rb') as stream:
return stream.read()
@@ -1893,7 +1733,7 @@ def _register(cls):
'SourcelessFileLoader',
)
for name in loader_names:
- loader_cls = getattr(importlib.machinery, name, type(None))
+ loader_cls = getattr(importlib_machinery, name, type(None))
register_loader_type(loader_cls, cls)
@@ -1903,13 +1743,12 @@ def _register(cls):
class EmptyProvider(NullProvider):
"""Provider that returns nothing for all requests"""
- # A special case, we don't want all Providers inheriting from NullProvider to have a potentially None module_path
- module_path: str | None = None # type: ignore[assignment]
+ module_path = None
_isdir = _has = lambda self, path: False
- def _get(self, path) -> bytes:
- return b''
+ def _get(self, path):
+ return ''
def _listdir(self, path):
return []
@@ -1921,14 +1760,13 @@ def __init__(self):
empty_provider = EmptyProvider()
-class ZipManifests(Dict[str, "MemoizedZipManifests.manifest_mod"]):
+class ZipManifests(dict):
"""
zip manifest builder
"""
- # `path` could be `StrPath | IO[bytes]` but that violates the LSP for `MemoizedZipManifests.load`
@classmethod
- def build(cls, path: str):
+ def build(cls, path):
"""
Build a dictionary similar to the zipimport directory
caches, except instead of tuples, store ZipInfo objects.
@@ -1954,11 +1792,9 @@ class MemoizedZipManifests(ZipManifests):
Memoized zipfile manifests.
"""
- class manifest_mod(NamedTuple):
- manifest: dict[str, zipfile.ZipInfo]
- mtime: float
+ manifest_mod = collections.namedtuple('manifest_mod', 'manifest mtime')
- def load(self, path: str) -> dict[str, zipfile.ZipInfo]: # type: ignore[override] # ZipManifests.load is a classmethod
+ def load(self, path):
"""
Load a manifest at path or return a suitable manifest already loaded.
"""
@@ -1975,12 +1811,10 @@ def load(self, path: str) -> dict[str, zipfile.ZipInfo]: # type: ignore[overrid
class ZipProvider(EggProvider):
"""Resource support for zips and eggs"""
- eagers: list[str] | None = None
+ eagers = None
_zip_manifests = MemoizedZipManifests()
- # ZipProvider's loader should always be a zipimporter or equivalent
- loader: zipimport.zipimporter
- def __init__(self, module: _ZipLoaderModule):
+ def __init__(self, module):
super().__init__(module)
self.zip_pre = self.loader.archive + os.sep
@@ -2006,7 +1840,7 @@ def _parts(self, zip_path):
def zipinfo(self):
return self._zip_manifests.load(self.loader.archive)
- def get_resource_filename(self, manager: ResourceManager, resource_name: str):
+ def get_resource_filename(self, manager, resource_name):
if not self.egg_name:
raise NotImplementedError(
"resource_filename() only supported for .egg, not .zip"
@@ -2029,7 +1863,7 @@ def _get_date_and_size(zip_stat):
return timestamp, size
# FIXME: 'ZipProvider._extract_resource' is too complex (12)
- def _extract_resource(self, manager: ResourceManager, zip_path) -> str: # noqa: C901
+ def _extract_resource(self, manager, zip_path): # noqa: C901
if zip_path in self._index():
for name in self._index()[zip_path]:
last = self._extract_resource(manager, os.path.join(zip_path, name))
@@ -2039,14 +1873,10 @@ def _extract_resource(self, manager: ResourceManager, zip_path) -> str: # noqa:
timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
if not WRITE_SUPPORT:
- raise OSError(
- '"os.rename" and "os.unlink" are not supported on this platform'
+ raise IOError(
+ '"os.rename" and "os.unlink" are not supported ' 'on this platform'
)
try:
- if not self.egg_name:
- raise OSError(
- '"egg_name" is empty. This likely means no egg could be found from the "module_path".'
- )
real_path = manager.get_cache_path(self.egg_name, self._parts(zip_path))
if self._is_current(real_path, zip_path):
@@ -2064,7 +1894,7 @@ def _extract_resource(self, manager: ResourceManager, zip_path) -> str: # noqa:
try:
rename(tmpnam, real_path)
- except OSError:
+ except os.error:
if os.path.isfile(real_path):
if self._is_current(real_path, zip_path):
# the file became current since it was checked above,
@@ -2077,7 +1907,7 @@ def _extract_resource(self, manager: ResourceManager, zip_path) -> str: # noqa:
return real_path
raise
- except OSError:
+ except os.error:
# report a user-friendly error
manager.extraction_error()
@@ -2125,20 +1955,20 @@ def _index(self):
self._dirindex = ind
return ind
- def _has(self, fspath) -> bool:
+ def _has(self, fspath):
zip_path = self._zipinfo_name(fspath)
return zip_path in self.zipinfo or zip_path in self._index()
- def _isdir(self, fspath) -> bool:
+ def _isdir(self, fspath):
return self._zipinfo_name(fspath) in self._index()
def _listdir(self, fspath):
return list(self._index().get(self._zipinfo_name(fspath), ()))
- def _eager_to_zip(self, resource_name: str):
+ def _eager_to_zip(self, resource_name):
return self._zipinfo_name(self._fn(self.egg_root, resource_name))
- def _resource_to_zip(self, resource_name: str):
+ def _resource_to_zip(self, resource_name):
return self._zipinfo_name(self._fn(self.module_path, resource_name))
@@ -2157,20 +1987,20 @@ class FileMetadata(EmptyProvider):
the provided location.
"""
- def __init__(self, path: StrPath):
+ def __init__(self, path):
self.path = path
def _get_metadata_path(self, name):
return self.path
- def has_metadata(self, name: str) -> bool:
+ def has_metadata(self, name):
return name == 'PKG-INFO' and os.path.isfile(self.path)
- def get_metadata(self, name: str):
+ def get_metadata(self, name):
if name != 'PKG-INFO':
raise KeyError("No metadata except PKG-INFO is available")
- with open(self.path, encoding='utf-8', errors="replace") as f:
+ with io.open(self.path, encoding='utf-8', errors="replace") as f:
metadata = f.read()
self._warn_on_replacement(metadata)
return metadata
@@ -2182,7 +2012,7 @@ def _warn_on_replacement(self, metadata):
msg = tmpl.format(**locals())
warnings.warn(msg)
- def get_metadata_lines(self, name: str) -> Iterator[str]:
+ def get_metadata_lines(self, name):
return yield_lines(self.get_metadata(name))
@@ -2206,7 +2036,7 @@ class PathMetadata(DefaultProvider):
dist = Distribution.from_filename(egg_path, metadata=metadata)
"""
- def __init__(self, path: str, egg_info: str):
+ def __init__(self, path, egg_info):
self.module_path = path
self.egg_info = egg_info
@@ -2214,7 +2044,7 @@ def __init__(self, path: str, egg_info: str):
class EggMetadata(ZipProvider):
"""Metadata provider for .egg files"""
- def __init__(self, importer: zipimport.zipimporter):
+ def __init__(self, importer):
"""Create a metadata provider from a zipimporter"""
self.zip_pre = importer.archive + os.sep
@@ -2226,12 +2056,10 @@ def __init__(self, importer: zipimport.zipimporter):
self._setup_prefix()
-_distribution_finders: dict[type, _DistFinderType[Any]] = _declare_state(
- 'dict', '_distribution_finders', {}
-)
+_declare_state('dict', _distribution_finders={})
-def register_finder(importer_type: type[_T], distribution_finder: _DistFinderType[_T]):
+def register_finder(importer_type, distribution_finder):
"""Register `distribution_finder` to find distributions in sys.path items
`importer_type` is the type or class of a PEP 302 "Importer" (sys.path item
@@ -2241,16 +2069,14 @@ def register_finder(importer_type: type[_T], distribution_finder: _DistFinderTyp
_distribution_finders[importer_type] = distribution_finder
-def find_distributions(path_item: str, only: bool = False):
+def find_distributions(path_item, only=False):
"""Yield distributions accessible via `path_item`"""
importer = get_importer(path_item)
finder = _find_adapter(_distribution_finders, importer)
return finder(importer, path_item, only)
-def find_eggs_in_zip(
- importer: zipimport.zipimporter, path_item: str, only: bool = False
-) -> Iterator[Distribution]:
+def find_eggs_in_zip(importer, path_item, only=False):
"""
Find eggs in zip files; possibly multiple nested eggs.
"""
@@ -2268,7 +2094,8 @@ def find_eggs_in_zip(
if _is_egg_path(subitem):
subpath = os.path.join(path_item, subitem)
dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath)
- yield from dists
+ for dist in dists:
+ yield dist
elif subitem.lower().endswith(('.dist-info', '.egg-info')):
subpath = os.path.join(path_item, subitem)
submeta = EggMetadata(zipimport.zipimporter(subpath))
@@ -2279,16 +2106,14 @@ def find_eggs_in_zip(
register_finder(zipimport.zipimporter, find_eggs_in_zip)
-def find_nothing(
- importer: object | None, path_item: str | None, only: bool | None = False
-):
+def find_nothing(importer, path_item, only=False):
return ()
register_finder(object, find_nothing)
-def find_on_path(importer: object | None, path_item, only=False):
+def find_on_path(importer, path_item, only=False):
"""Yield distributions accessible on a sys.path directory"""
path_item = _normalize_cached(path_item)
@@ -2305,7 +2130,8 @@ def find_on_path(importer: object | None, path_item, only=False):
for entry in sorted(entries):
fullpath = os.path.join(path_item, entry)
factory = dist_factory(path_item, entry, only)
- yield from factory(fullpath)
+ for dist in factory(fullpath):
+ yield dist
def dist_factory(path_item, entry, only):
@@ -2343,7 +2169,7 @@ def __call__(self, fullpath):
return iter(())
-def safe_listdir(path: StrOrBytesPath):
+def safe_listdir(path):
"""
Attempt to list contents of path, but suppress some exceptions.
"""
@@ -2359,13 +2185,13 @@ def safe_listdir(path: StrOrBytesPath):
return ()
-def distributions_from_metadata(path: str):
+def distributions_from_metadata(path):
root = os.path.dirname(path)
if os.path.isdir(path):
if len(os.listdir(path)) == 0:
# empty metadata dir; skip
return
- metadata: _MetadataType = PathMetadata(root, path)
+ metadata = PathMetadata(root, path)
else:
metadata = FileMetadata(path)
entry = os.path.basename(path)
@@ -2381,10 +2207,11 @@ def non_empty_lines(path):
"""
Yield non-empty lines from file at path
"""
- for line in _read_utf8_with_fallback(path).splitlines():
- line = line.strip()
- if line:
- yield line
+ with open(path) as f:
+ for line in f:
+ line = line.strip()
+ if line:
+ yield line
def resolve_egg_link(path):
@@ -2403,19 +2230,13 @@ def resolve_egg_link(path):
if hasattr(pkgutil, 'ImpImporter'):
register_finder(pkgutil.ImpImporter, find_on_path)
-register_finder(importlib.machinery.FileFinder, find_on_path)
+register_finder(importlib_machinery.FileFinder, find_on_path)
-_namespace_handlers: dict[type, _NSHandlerType[Any]] = _declare_state(
- 'dict', '_namespace_handlers', {}
-)
-_namespace_packages: dict[str | None, list[str]] = _declare_state(
- 'dict', '_namespace_packages', {}
-)
+_declare_state('dict', _namespace_handlers={})
+_declare_state('dict', _namespace_packages={})
-def register_namespace_handler(
- importer_type: type[_T], namespace_handler: _NSHandlerType[_T]
-):
+def register_namespace_handler(importer_type, namespace_handler):
"""Register `namespace_handler` to declare namespace packages
`importer_type` is the type or class of a PEP 302 "Importer" (sys.path item
@@ -2470,7 +2291,7 @@ def _handle_ns(packageName, path_item):
return subpath
-def _rebuild_mod_path(orig_path, package_name, module: types.ModuleType):
+def _rebuild_mod_path(orig_path, package_name, module):
"""
Rebuild module.__path__ ensuring that all entries are ordered
corresponding to their sys.path order
@@ -2504,7 +2325,7 @@ def position_in_sys_path(path):
module.__path__ = new_path
-def declare_namespace(packageName: str):
+def declare_namespace(packageName):
"""Declare that package 'packageName' is a namespace package"""
msg = (
@@ -2521,7 +2342,7 @@ def declare_namespace(packageName: str):
if packageName in _namespace_packages:
return
- path: MutableSequence[str] = sys.path
+ path = sys.path
parent, _, _ = packageName.rpartition('.')
if parent:
@@ -2547,7 +2368,7 @@ def declare_namespace(packageName: str):
_imp.release_lock()
-def fixup_namespace_packages(path_item: str, parent: str | None = None):
+def fixup_namespace_packages(path_item, parent=None):
"""Ensure that previously-declared namespace packages include path_item"""
_imp.acquire_lock()
try:
@@ -2559,12 +2380,7 @@ def fixup_namespace_packages(path_item: str, parent: str | None = None):
_imp.release_lock()
-def file_ns_handler(
- importer: object,
- path_item: StrPath,
- packageName: str,
- module: types.ModuleType,
-):
+def file_ns_handler(importer, path_item, packageName, module):
"""Compute an ns-package subpath for a filesystem or zipfile importer"""
subpath = os.path.join(path_item, packageName.split('.')[-1])
@@ -2581,31 +2397,22 @@ def file_ns_handler(
register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
register_namespace_handler(zipimport.zipimporter, file_ns_handler)
-register_namespace_handler(importlib.machinery.FileFinder, file_ns_handler)
+register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
-def null_ns_handler(
- importer: object,
- path_item: str | None,
- packageName: str | None,
- module: _ModuleLike | None,
-):
+def null_ns_handler(importer, path_item, packageName, module):
return None
register_namespace_handler(object, null_ns_handler)
-@overload
-def normalize_path(filename: StrPath) -> str: ...
-@overload
-def normalize_path(filename: BytesPath) -> bytes: ...
-def normalize_path(filename: StrOrBytesPath):
+def normalize_path(filename):
"""Normalize a file/dir name for comparison purposes"""
return os.path.normcase(os.path.realpath(os.path.normpath(_cygwin_patch(filename))))
-def _cygwin_patch(filename: StrOrBytesPath): # pragma: nocover
+def _cygwin_patch(filename): # pragma: nocover
"""
Contrary to POSIX 2008, on Cygwin, getcwd (3) contains
symlink components. Using
@@ -2616,19 +2423,12 @@ def _cygwin_patch(filename: StrOrBytesPath): # pragma: nocover
return os.path.abspath(filename) if sys.platform == 'cygwin' else filename
-if TYPE_CHECKING:
- # https://github.com/python/mypy/issues/16261
- # https://github.com/python/typeshed/issues/6347
- @overload
- def _normalize_cached(filename: StrPath) -> str: ...
- @overload
- def _normalize_cached(filename: BytesPath) -> bytes: ...
- def _normalize_cached(filename: StrOrBytesPath) -> str | bytes: ...
-else:
-
- @functools.lru_cache(maxsize=None)
- def _normalize_cached(filename):
- return normalize_path(filename)
+def _normalize_cached(filename, _cache={}):
+ try:
+ return _cache[filename]
+ except KeyError:
+ _cache[filename] = result = normalize_path(filename)
+ return result
def _is_egg_path(path):
@@ -2681,14 +2481,7 @@ def _set_parent_ns(packageName):
class EntryPoint:
"""Object representing an advertised importable object"""
- def __init__(
- self,
- name: str,
- module_name: str,
- attrs: Iterable[str] = (),
- extras: Iterable[str] = (),
- dist: Distribution | None = None,
- ):
+ def __init__(self, name, module_name, attrs=(), extras=(), dist=None):
if not MODULE(module_name):
raise ValueError("Invalid module name", module_name)
self.name = name
@@ -2708,26 +2501,7 @@ def __str__(self):
def __repr__(self):
return "EntryPoint.parse(%r)" % str(self)
- @overload
- def load(
- self,
- require: Literal[True] = True,
- env: Environment | None = None,
- installer: _InstallerType | None = None,
- ) -> _ResolvedEntryPoint: ...
- @overload
- def load(
- self,
- require: Literal[False],
- *args: Any,
- **kwargs: Any,
- ) -> _ResolvedEntryPoint: ...
- def load(
- self,
- require: bool = True,
- *args: Environment | _InstallerType | None,
- **kwargs: Environment | _InstallerType | None,
- ) -> _ResolvedEntryPoint:
+ def load(self, require=True, *args, **kwargs):
"""
Require packages for this EntryPoint, then resolve it.
"""
@@ -2739,12 +2513,10 @@ def load(
stacklevel=2,
)
if require:
- # We could pass `env` and `installer` directly,
- # but keeping `*args` and `**kwargs` for backwards compatibility
- self.require(*args, **kwargs) # type: ignore
+ self.require(*args, **kwargs)
return self.resolve()
- def resolve(self) -> _ResolvedEntryPoint:
+ def resolve(self):
"""
Resolve the entry point from its module and attrs.
"""
@@ -2754,14 +2526,9 @@ def resolve(self) -> _ResolvedEntryPoint:
except AttributeError as exc:
raise ImportError(str(exc)) from exc
- def require(
- self,
- env: Environment | None = None,
- installer: _InstallerType | None = None,
- ):
- if not self.dist:
- error_cls = UnknownExtra if self.extras else AttributeError
- raise error_cls("Can't require() without a distribution", self)
+ def require(self, env=None, installer=None):
+ if self.extras and not self.dist:
+ raise UnknownExtra("Can't require() without a distribution", self)
# Get the requirements for this entry point with all its extras and
# then resolve them. We have to pass `extras` along when resolving so
@@ -2782,7 +2549,7 @@ def require(
)
@classmethod
- def parse(cls, src: str, dist: Distribution | None = None):
+ def parse(cls, src, dist=None):
"""Parse a single entry point from string `src`
Entry point syntax follows the form::
@@ -2807,20 +2574,15 @@ def _parse_extras(cls, extras_spec):
return ()
req = Requirement.parse('x' + extras_spec)
if req.specs:
- raise ValueError
+ raise ValueError()
return req.extras
@classmethod
- def parse_group(
- cls,
- group: str,
- lines: _NestedStr,
- dist: Distribution | None = None,
- ):
+ def parse_group(cls, group, lines, dist=None):
"""Parse an entry point group"""
if not MODULE(group):
raise ValueError("Invalid group name", group)
- this: dict[str, Self] = {}
+ this = {}
for line in yield_lines(lines):
ep = cls.parse(line, dist)
if ep.name in this:
@@ -2829,19 +2591,14 @@ def parse_group(
return this
@classmethod
- def parse_map(
- cls,
- data: str | Iterable[str] | dict[str, str | Iterable[str]],
- dist: Distribution | None = None,
- ):
+ def parse_map(cls, data, dist=None):
"""Parse a map of entry point groups"""
- _data: Iterable[tuple[str | None, str | Iterable[str]]]
if isinstance(data, dict):
- _data = data.items()
+ data = data.items()
else:
- _data = split_sections(data)
- maps: dict[str, dict[str, Self]] = {}
- for group, lines in _data:
+ data = split_sections(data)
+ maps = {}
+ for group, lines in data:
if group is None:
if not lines:
continue
@@ -2875,13 +2632,13 @@ class Distribution:
def __init__(
self,
- location: str | None = None,
- metadata: _MetadataType = None,
- project_name: str | None = None,
- version: str | None = None,
- py_version: str | None = PY_MAJOR,
- platform: str | None = None,
- precedence: int = EGG_DIST,
+ location=None,
+ metadata=None,
+ project_name=None,
+ version=None,
+ py_version=PY_MAJOR,
+ platform=None,
+ precedence=EGG_DIST,
):
self.project_name = safe_name(project_name or 'Unknown')
if version is not None:
@@ -2893,13 +2650,7 @@ def __init__(
self._provider = metadata or empty_provider
@classmethod
- def from_location(
- cls,
- location: str,
- basename: StrPath,
- metadata: _MetadataType = None,
- **kw: int, # We could set `precedence` explicitly, but keeping this as `**kw` for full backwards and subclassing compatibility
- ) -> Distribution:
+ def from_location(cls, location, basename, metadata=None, **kw):
project_name, version, py_version, platform = [None] * 4
basename, ext = os.path.splitext(basename)
if ext.lower() in _distributionImpl:
@@ -2937,25 +2688,25 @@ def hashcmp(self):
def __hash__(self):
return hash(self.hashcmp)
- def __lt__(self, other: Distribution):
+ def __lt__(self, other):
return self.hashcmp < other.hashcmp
- def __le__(self, other: Distribution):
+ def __le__(self, other):
return self.hashcmp <= other.hashcmp
- def __gt__(self, other: Distribution):
+ def __gt__(self, other):
return self.hashcmp > other.hashcmp
- def __ge__(self, other: Distribution):
+ def __ge__(self, other):
return self.hashcmp >= other.hashcmp
- def __eq__(self, other: object):
+ def __eq__(self, other):
if not isinstance(other, self.__class__):
# It's not a Distribution, so they are not equal
return False
return self.hashcmp == other.hashcmp
- def __ne__(self, other: object):
+ def __ne__(self, other):
return not self == other
# These properties have to be lazy so that we don't have to load any
@@ -2975,12 +2726,12 @@ def parsed_version(self):
if not hasattr(self, "_parsed_version"):
try:
self._parsed_version = parse_version(self.version)
- except _packaging_version.InvalidVersion as ex:
+ except packaging.version.InvalidVersion as ex:
info = f"(package: {self.project_name})"
if hasattr(ex, "add_note"):
ex.add_note(info) # PEP 678
raise
- raise _packaging_version.InvalidVersion(f"{str(ex)} {info}") from None
+ raise packaging.version.InvalidVersion(f"{str(ex)} {info}") from None
return self._parsed_version
@@ -2988,7 +2739,7 @@ def parsed_version(self):
def _forgiving_parsed_version(self):
try:
return self.parsed_version
- except _packaging_version.InvalidVersion as ex:
+ except packaging.version.InvalidVersion as ex:
self._parsed_version = parse_version(_forgiving_version(self.version))
notes = "\n".join(getattr(ex, "__notes__", [])) # PEP 678
@@ -3038,14 +2789,14 @@ def _dep_map(self):
return self.__dep_map
@staticmethod
- def _filter_extras(dm: dict[str | None, list[Requirement]]):
+ def _filter_extras(dm):
"""
Given a mapping of extras to dependencies, strip off
environment markers and filter out any dependencies
not matching the markers.
"""
for extra in list(filter(None, dm)):
- new_extra: str | None = extra
+ new_extra = extra
reqs = dm.pop(extra)
new_extra, _, marker = extra.partition(':')
fails_marker = marker and (
@@ -3065,10 +2816,10 @@ def _build_dep_map(self):
dm.setdefault(extra, []).extend(parse_requirements(reqs))
return dm
- def requires(self, extras: Iterable[str] = ()):
+ def requires(self, extras=()):
"""List of Requirements needed for this distro if `extras` are used"""
dm = self._dep_map
- deps: list[Requirement] = []
+ deps = []
deps.extend(dm.get(None, ()))
for ext in extras:
try:
@@ -3098,18 +2849,21 @@ def _get_metadata_path_for_display(self, name):
def _get_metadata(self, name):
if self.has_metadata(name):
- yield from self.get_metadata_lines(name)
+ for line in self.get_metadata_lines(name):
+ yield line
def _get_version(self):
lines = self._get_metadata(self.PKG_INFO)
- return _version_from_file(lines)
+ version = _version_from_file(lines)
- def activate(self, path: list[str] | None = None, replace: bool = False):
+ return version
+
+ def activate(self, path=None, replace=False):
"""Ensure distribution is importable on `path` (default=sys.path)"""
if path is None:
path = sys.path
self.insert_on(path, replace=replace)
- if path is sys.path and self.location is not None:
+ if path is sys.path:
fixup_namespace_packages(self.location)
for pkg in self._get_metadata('namespace_packages.txt'):
if pkg in sys.modules:
@@ -3149,62 +2903,50 @@ def __getattr__(self, attr):
def __dir__(self):
return list(
- set(super().__dir__())
+ set(super(Distribution, self).__dir__())
| set(attr for attr in self._provider.__dir__() if not attr.startswith('_'))
)
@classmethod
- def from_filename(
- cls,
- filename: StrPath,
- metadata: _MetadataType = None,
- **kw: int, # We could set `precedence` explicitly, but keeping this as `**kw` for full backwards and subclassing compatibility
- ):
+ def from_filename(cls, filename, metadata=None, **kw):
return cls.from_location(
_normalize_cached(filename), os.path.basename(filename), metadata, **kw
)
def as_requirement(self):
"""Return a ``Requirement`` that matches this distribution exactly"""
- if isinstance(self.parsed_version, _packaging_version.Version):
+ if isinstance(self.parsed_version, packaging.version.Version):
spec = "%s==%s" % (self.project_name, self.parsed_version)
else:
spec = "%s===%s" % (self.project_name, self.parsed_version)
return Requirement.parse(spec)
- def load_entry_point(self, group: str, name: str) -> _ResolvedEntryPoint:
+ def load_entry_point(self, group, name):
"""Return the `name` entry point of `group` or raise ImportError"""
ep = self.get_entry_info(group, name)
if ep is None:
raise ImportError("Entry point %r not found" % ((group, name),))
return ep.load()
- @overload
- def get_entry_map(self, group: None = None) -> dict[str, dict[str, EntryPoint]]: ...
- @overload
- def get_entry_map(self, group: str) -> dict[str, EntryPoint]: ...
- def get_entry_map(self, group: str | None = None):
+ def get_entry_map(self, group=None):
"""Return the entry point map for `group`, or the full entry map"""
- if not hasattr(self, "_ep_map"):
- self._ep_map = EntryPoint.parse_map(
+ try:
+ ep_map = self._ep_map
+ except AttributeError:
+ ep_map = self._ep_map = EntryPoint.parse_map(
self._get_metadata('entry_points.txt'), self
)
if group is not None:
- return self._ep_map.get(group, {})
- return self._ep_map
+ return ep_map.get(group, {})
+ return ep_map
- def get_entry_info(self, group: str, name: str):
+ def get_entry_info(self, group, name):
"""Return the EntryPoint object for `group`+`name`, or ``None``"""
return self.get_entry_map(group).get(name)
# FIXME: 'Distribution.insert_on' is too complex (13)
- def insert_on( # noqa: C901
- self,
- path: list[str],
- loc=None,
- replace: bool = False,
- ):
+ def insert_on(self, path, loc=None, replace=False): # noqa: C901
"""Ensure self.location is on path
If replace=False (default):
@@ -3309,14 +3051,13 @@ def has_version(self):
return False
return True
- def clone(self, **kw: str | int | IResourceProvider | None):
+ def clone(self, **kw):
"""Copy this distribution, substituting in any changed keyword args"""
names = 'project_name version py_version platform location precedence'
for attr in names.split():
kw.setdefault(attr, getattr(self, attr, None))
kw.setdefault('metadata', self._provider)
- # Unsafely unpacking. But keeping **kw for backwards and subclassing compatibility
- return self.__class__(**kw) # type:ignore[arg-type]
+ return self.__class__(**kw)
@property
def extras(self):
@@ -3369,11 +3110,11 @@ def _dep_map(self):
self.__dep_map = self._compute_dependencies()
return self.__dep_map
- def _compute_dependencies(self) -> dict[str | None, list[Requirement]]:
+ def _compute_dependencies(self):
"""Recompute this distribution's dependencies."""
- self.__dep_map: dict[str | None, list[Requirement]] = {None: []}
+ dm = self.__dep_map = {None: []}
- reqs: list[Requirement] = []
+ reqs = []
# Including any condition expressions
for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
reqs.extend(parse_requirements(req))
@@ -3384,15 +3125,13 @@ def reqs_for_extra(extra):
yield req
common = types.MappingProxyType(dict.fromkeys(reqs_for_extra(None)))
- self.__dep_map[None].extend(common)
+ dm[None].extend(common)
for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
s_extra = safe_extra(extra.strip())
- self.__dep_map[s_extra] = [
- r for r in reqs_for_extra(extra) if r not in common
- ]
+ dm[s_extra] = [r for r in reqs_for_extra(extra) if r not in common]
- return self.__dep_map
+ return dm
_distributionImpl = {
@@ -3415,7 +3154,7 @@ def issue_warning(*args, **kw):
warnings.warn(stacklevel=level + 1, *args, **kw)
-def parse_requirements(strs: _NestedStr):
+def parse_requirements(strs):
"""
Yield ``Requirement`` objects for each specification in `strs`.
@@ -3424,20 +3163,19 @@ def parse_requirements(strs: _NestedStr):
return map(Requirement, join_continuation(map(drop_comment, yield_lines(strs))))
-class RequirementParseError(_packaging_requirements.InvalidRequirement):
+class RequirementParseError(packaging.requirements.InvalidRequirement):
"Compatibility wrapper for InvalidRequirement"
-class Requirement(_packaging_requirements.Requirement):
- def __init__(self, requirement_string: str):
+class Requirement(packaging.requirements.Requirement):
+ def __init__(self, requirement_string):
"""DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
- super().__init__(requirement_string)
+ super(Requirement, self).__init__(requirement_string)
self.unsafe_name = self.name
project_name = safe_name(self.name)
self.project_name, self.key = project_name, project_name.lower()
self.specs = [(spec.operator, spec.version) for spec in self.specifier]
- # packaging.requirements.Requirement uses a set for its extras. We use a variable-length tuple
- self.extras: tuple[str] = tuple(map(safe_extra, self.extras))
+ self.extras = tuple(map(safe_extra, self.extras))
self.hashCmp = (
self.key,
self.url,
@@ -3447,13 +3185,13 @@ def __init__(self, requirement_string: str):
)
self.__hash = hash(self.hashCmp)
- def __eq__(self, other: object):
+ def __eq__(self, other):
return isinstance(other, Requirement) and self.hashCmp == other.hashCmp
def __ne__(self, other):
return not self == other
- def __contains__(self, item: Distribution | str | tuple[str, ...]) -> bool:
+ def __contains__(self, item):
if isinstance(item, Distribution):
if item.key != self.key:
return False
@@ -3472,7 +3210,7 @@ def __repr__(self):
return "Requirement.parse(%r)" % str(self)
@staticmethod
- def parse(s: str | Iterable[str]):
+ def parse(s):
(req,) = parse_requirements(s)
return req
@@ -3487,18 +3225,15 @@ def _always_object(classes):
return classes
-def _find_adapter(registry: Mapping[type, _AdapterT], ob: object) -> _AdapterT:
+def _find_adapter(registry, ob):
"""Return an adapter factory for `ob` from `registry`"""
types = _always_object(inspect.getmro(getattr(ob, '__class__', type(ob))))
for t in types:
if t in registry:
return registry[t]
- # _find_adapter would previously return None, and immediately be called.
- # So we're raising a TypeError to keep backward compatibility if anyone depended on that behaviour.
- raise TypeError(f"Could not find adapter for {registry} and {ob}")
-def ensure_directory(path: StrOrBytesPath):
+def ensure_directory(path):
"""Ensure that the parent directory of `path` exists"""
dirname = os.path.dirname(path)
os.makedirs(dirname, exist_ok=True)
@@ -3507,7 +3242,7 @@ def ensure_directory(path: StrOrBytesPath):
def _bypass_ensure_directory(path):
"""Sandbox-bypassing version of ensure_directory()"""
if not WRITE_SUPPORT:
- raise OSError('"os.mkdir" not supported on this platform.')
+ raise IOError('"os.mkdir" not supported on this platform.')
dirname, filename = split(path)
if dirname and filename and not isdir(dirname):
_bypass_ensure_directory(dirname)
@@ -3517,7 +3252,7 @@ def _bypass_ensure_directory(path):
pass
-def split_sections(s: _NestedStr) -> Iterator[tuple[str | None, list[str]]]:
+def split_sections(s):
"""Split a string or iterable thereof into (section, content) pairs
Each ``section`` is a stripped version of the section header ("[section]")
@@ -3561,47 +3296,6 @@ def _mkstemp(*args, **kw):
warnings.filterwarnings("ignore", category=PEP440Warning, append=True)
-class PkgResourcesDeprecationWarning(Warning):
- """
- Base class for warning about deprecations in ``pkg_resources``
-
- This class is not derived from ``DeprecationWarning``, and as such is
- visible by default.
- """
-
-
-# Ported from ``setuptools`` to avoid introducing an import inter-dependency:
-_LOCALE_ENCODING = "locale" if sys.version_info >= (3, 10) else None
-
-
-def _read_utf8_with_fallback(file: str, fallback_encoding=_LOCALE_ENCODING) -> str:
- """See setuptools.unicode_utils._read_utf8_with_fallback"""
- try:
- with open(file, "r", encoding="utf-8") as f:
- return f.read()
- except UnicodeDecodeError: # pragma: no cover
- msg = f"""\
- ********************************************************************************
- `encoding="utf-8"` fails with {file!r}, trying `encoding={fallback_encoding!r}`.
-
- This fallback behaviour is considered **deprecated** and future versions of
- `setuptools/pkg_resources` may not implement it.
-
- Please encode {file!r} with "utf-8" to ensure future builds will succeed.
-
- If this file was produced by `setuptools` itself, cleaning up the cached files
- and re-building/re-installing the package with a newer version of `setuptools`
- (e.g. by updating `build-system.requires` in its `pyproject.toml`)
- might solve the problem.
- ********************************************************************************
- """
- # TODO: Add a deadline?
- # See comment in setuptools.unicode_utils._Utf8EncodingNeeded
- warnings.warn(msg, PkgResourcesDeprecationWarning, stacklevel=2)
- with open(file, "r", encoding=fallback_encoding) as f:
- return f.read()
-
-
# from jaraco.functools 1.3
def _call_aside(f, *args, **kwargs):
f(*args, **kwargs)
@@ -3620,6 +3314,15 @@ def _initialize(g=globals()):
)
+class PkgResourcesDeprecationWarning(Warning):
+ """
+ Base class for warning about deprecations in ``pkg_resources``
+
+ This class is not derived from ``DeprecationWarning``, and as such is
+ visible by default.
+ """
+
+
@_call_aside
def _initialize_master_working_set():
"""
@@ -3633,7 +3336,8 @@ def _initialize_master_working_set():
Invocation by other packages is unsupported and done
at their own risk.
"""
- working_set = _declare_state('object', 'working_set', WorkingSet._build_master())
+ working_set = WorkingSet._build_master()
+ _declare_state('object', working_set=working_set)
require = working_set.require
iter_entry_points = working_set.iter_entry_points
@@ -3654,23 +3358,3 @@ def _initialize_master_working_set():
# match order
list(map(working_set.add_entry, sys.path))
globals().update(locals())
-
-
-if TYPE_CHECKING:
- # All of these are set by the @_call_aside methods above
- __resource_manager = ResourceManager() # Won't exist at runtime
- resource_exists = __resource_manager.resource_exists
- resource_isdir = __resource_manager.resource_isdir
- resource_filename = __resource_manager.resource_filename
- resource_stream = __resource_manager.resource_stream
- resource_string = __resource_manager.resource_string
- resource_listdir = __resource_manager.resource_listdir
- set_extraction_path = __resource_manager.set_extraction_path
- cleanup_resources = __resource_manager.cleanup_resources
-
- working_set = WorkingSet()
- require = working_set.require
- iter_entry_points = working_set.iter_entry_points
- add_activation_listener = working_set.subscribe
- run_script = working_set.run_script
- run_main = run_script
diff --git a/venv1/Lib/site-packages/pip/_vendor/platformdirs/__init__.py b/venv1/Lib/site-packages/pip/_vendor/platformdirs/__init__.py
index 2325ec2e..c46a145c 100644
--- a/venv1/Lib/site-packages/pip/_vendor/platformdirs/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/platformdirs/__init__.py
@@ -1,61 +1,55 @@
"""
-Utilities for determining application-specific dirs.
-
-See for details and usage.
-
+Utilities for determining application-specific dirs. See for details and
+usage.
"""
-
from __future__ import annotations
import os
import sys
-from typing import TYPE_CHECKING
+from pathlib import Path
+
+if sys.version_info >= (3, 8): # pragma: no cover (py38+)
+ from typing import Literal
+else: # pragma: no cover (py38+)
+ from pip._vendor.typing_extensions import Literal
from .api import PlatformDirsABC
from .version import __version__
from .version import __version_tuple__ as __version_info__
-if TYPE_CHECKING:
- from pathlib import Path
- from typing import Literal
-
-if sys.platform == "win32":
- from pip._vendor.platformdirs.windows import Windows as _Result
-elif sys.platform == "darwin":
- from pip._vendor.platformdirs.macos import MacOS as _Result
-else:
- from pip._vendor.platformdirs.unix import Unix as _Result
-
def _set_platform_dir_class() -> type[PlatformDirsABC]:
+ if sys.platform == "win32":
+ from pip._vendor.platformdirs.windows import Windows as Result
+ elif sys.platform == "darwin":
+ from pip._vendor.platformdirs.macos import MacOS as Result
+ else:
+ from pip._vendor.platformdirs.unix import Unix as Result
+
if os.getenv("ANDROID_DATA") == "/data" and os.getenv("ANDROID_ROOT") == "/system":
if os.getenv("SHELL") or os.getenv("PREFIX"):
- return _Result
+ return Result
- from pip._vendor.platformdirs.android import _android_folder # noqa: PLC0415
+ from pip._vendor.platformdirs.android import _android_folder
if _android_folder() is not None:
- from pip._vendor.platformdirs.android import Android # noqa: PLC0415
+ from pip._vendor.platformdirs.android import Android
- return Android # return to avoid redefinition of a result
+ return Android # return to avoid redefinition of result
- return _Result
+ return Result
-if TYPE_CHECKING:
- # Work around mypy issue: https://github.com/python/mypy/issues/10962
- PlatformDirs = _Result
-else:
- PlatformDirs = _set_platform_dir_class() #: Currently active platform
+PlatformDirs = _set_platform_dir_class() #: Currently active platform
AppDirs = PlatformDirs #: Backwards compatibility with appdirs
def user_data_dir(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- roaming: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ roaming: bool = False,
+ ensure_exists: bool = False,
) -> str:
"""
:param appname: See `appname `.
@@ -76,10 +70,10 @@ def user_data_dir(
def site_data_dir(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- multipath: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ multipath: bool = False,
+ ensure_exists: bool = False,
) -> str:
"""
:param appname: See `appname `.
@@ -100,10 +94,10 @@ def site_data_dir(
def user_config_dir(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- roaming: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ roaming: bool = False,
+ ensure_exists: bool = False,
) -> str:
"""
:param appname: See `appname `.
@@ -124,10 +118,10 @@ def user_config_dir(
def site_config_dir(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- multipath: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ multipath: bool = False,
+ ensure_exists: bool = False,
) -> str:
"""
:param appname: See `appname `.
@@ -148,10 +142,10 @@ def site_config_dir(
def user_cache_dir(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ opinion: bool = True,
+ ensure_exists: bool = False,
) -> str:
"""
:param appname: See `appname `.
@@ -172,10 +166,10 @@ def user_cache_dir(
def site_cache_dir(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ opinion: bool = True,
+ ensure_exists: bool = False,
) -> str:
"""
:param appname: See `appname `.
@@ -196,10 +190,10 @@ def site_cache_dir(
def user_state_dir(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- roaming: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ roaming: bool = False,
+ ensure_exists: bool = False,
) -> str:
"""
:param appname: See `appname `.
@@ -220,10 +214,10 @@ def user_state_dir(
def user_log_dir(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ opinion: bool = True,
+ ensure_exists: bool = False,
) -> str:
"""
:param appname: See `appname `.
@@ -243,41 +237,18 @@ def user_log_dir(
def user_documents_dir() -> str:
- """:returns: documents directory tied to the user"""
+ """
+ :returns: documents directory tied to the user
+ """
return PlatformDirs().user_documents_dir
-def user_downloads_dir() -> str:
- """:returns: downloads directory tied to the user"""
- return PlatformDirs().user_downloads_dir
-
-
-def user_pictures_dir() -> str:
- """:returns: pictures directory tied to the user"""
- return PlatformDirs().user_pictures_dir
-
-
-def user_videos_dir() -> str:
- """:returns: videos directory tied to the user"""
- return PlatformDirs().user_videos_dir
-
-
-def user_music_dir() -> str:
- """:returns: music directory tied to the user"""
- return PlatformDirs().user_music_dir
-
-
-def user_desktop_dir() -> str:
- """:returns: desktop directory tied to the user"""
- return PlatformDirs().user_desktop_dir
-
-
def user_runtime_dir(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ opinion: bool = True,
+ ensure_exists: bool = False,
) -> str:
"""
:param appname: See `appname `.
@@ -296,36 +267,12 @@ def user_runtime_dir(
).user_runtime_dir
-def site_runtime_dir(
- appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
- version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
-) -> str:
- """
- :param appname: See `appname `.
- :param appauthor: See `appauthor `.
- :param version: See `version `.
- :param opinion: See `opinion `.
- :param ensure_exists: See `ensure_exists `.
- :returns: runtime directory shared by users
- """
- return PlatformDirs(
- appname=appname,
- appauthor=appauthor,
- version=version,
- opinion=opinion,
- ensure_exists=ensure_exists,
- ).site_runtime_dir
-
-
def user_data_path(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- roaming: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ roaming: bool = False,
+ ensure_exists: bool = False,
) -> Path:
"""
:param appname: See `appname `.
@@ -346,10 +293,10 @@ def user_data_path(
def site_data_path(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- multipath: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ multipath: bool = False,
+ ensure_exists: bool = False,
) -> Path:
"""
:param appname: See `appname `.
@@ -370,10 +317,10 @@ def site_data_path(
def user_config_path(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- roaming: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ roaming: bool = False,
+ ensure_exists: bool = False,
) -> Path:
"""
:param appname: See `appname `.
@@ -394,10 +341,10 @@ def user_config_path(
def site_config_path(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- multipath: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ multipath: bool = False,
+ ensure_exists: bool = False,
) -> Path:
"""
:param appname: See `appname `.
@@ -418,10 +365,10 @@ def site_config_path(
def site_cache_path(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ opinion: bool = True,
+ ensure_exists: bool = False,
) -> Path:
"""
:param appname: See `appname `.
@@ -442,10 +389,10 @@ def site_cache_path(
def user_cache_path(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ opinion: bool = True,
+ ensure_exists: bool = False,
) -> Path:
"""
:param appname: See `appname `.
@@ -466,10 +413,10 @@ def user_cache_path(
def user_state_path(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- roaming: bool = False, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ roaming: bool = False,
+ ensure_exists: bool = False,
) -> Path:
"""
:param appname: See `appname `.
@@ -490,10 +437,10 @@ def user_state_path(
def user_log_path(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ opinion: bool = True,
+ ensure_exists: bool = False,
) -> Path:
"""
:param appname: See `appname `.
@@ -513,41 +460,18 @@ def user_log_path(
def user_documents_path() -> Path:
- """:returns: documents a path tied to the user"""
+ """
+ :returns: documents path tied to the user
+ """
return PlatformDirs().user_documents_path
-def user_downloads_path() -> Path:
- """:returns: downloads path tied to the user"""
- return PlatformDirs().user_downloads_path
-
-
-def user_pictures_path() -> Path:
- """:returns: pictures path tied to the user"""
- return PlatformDirs().user_pictures_path
-
-
-def user_videos_path() -> Path:
- """:returns: videos path tied to the user"""
- return PlatformDirs().user_videos_path
-
-
-def user_music_path() -> Path:
- """:returns: music path tied to the user"""
- return PlatformDirs().user_music_path
-
-
-def user_desktop_path() -> Path:
- """:returns: desktop path tied to the user"""
- return PlatformDirs().user_desktop_path
-
-
def user_runtime_path(
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
+ opinion: bool = True,
+ ensure_exists: bool = False,
) -> Path:
"""
:param appname: See `appname `.
@@ -566,66 +490,30 @@ def user_runtime_path(
).user_runtime_path
-def site_runtime_path(
- appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
- version: str | None = None,
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
-) -> Path:
- """
- :param appname: See `appname `.
- :param appauthor: See `appauthor `.
- :param version: See `version `.
- :param opinion: See `opinion `.
- :param ensure_exists: See `ensure_exists `.
- :returns: runtime path shared by users
- """
- return PlatformDirs(
- appname=appname,
- appauthor=appauthor,
- version=version,
- opinion=opinion,
- ensure_exists=ensure_exists,
- ).site_runtime_path
-
-
__all__ = [
- "AppDirs",
- "PlatformDirs",
- "PlatformDirsABC",
"__version__",
"__version_info__",
- "site_cache_dir",
- "site_cache_path",
- "site_config_dir",
- "site_config_path",
- "site_data_dir",
- "site_data_path",
- "site_runtime_dir",
- "site_runtime_path",
- "user_cache_dir",
- "user_cache_path",
- "user_config_dir",
- "user_config_path",
+ "PlatformDirs",
+ "AppDirs",
+ "PlatformDirsABC",
"user_data_dir",
- "user_data_path",
- "user_desktop_dir",
- "user_desktop_path",
- "user_documents_dir",
- "user_documents_path",
- "user_downloads_dir",
- "user_downloads_path",
+ "user_config_dir",
+ "user_cache_dir",
+ "user_state_dir",
"user_log_dir",
- "user_log_path",
- "user_music_dir",
- "user_music_path",
- "user_pictures_dir",
- "user_pictures_path",
+ "user_documents_dir",
"user_runtime_dir",
- "user_runtime_path",
- "user_state_dir",
+ "site_data_dir",
+ "site_config_dir",
+ "site_cache_dir",
+ "user_data_path",
+ "user_config_path",
+ "user_cache_path",
"user_state_path",
- "user_videos_dir",
- "user_videos_path",
+ "user_log_path",
+ "user_documents_path",
+ "user_runtime_path",
+ "site_data_path",
+ "site_config_path",
+ "site_cache_path",
]
diff --git a/venv1/Lib/site-packages/pip/_vendor/platformdirs/__main__.py b/venv1/Lib/site-packages/pip/_vendor/platformdirs/__main__.py
index fa8a677a..7171f131 100644
--- a/venv1/Lib/site-packages/pip/_vendor/platformdirs/__main__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/platformdirs/__main__.py
@@ -1,5 +1,3 @@
-"""Main entry point."""
-
from __future__ import annotations
from pip._vendor.platformdirs import PlatformDirs, __version__
@@ -11,44 +9,38 @@
"user_state_dir",
"user_log_dir",
"user_documents_dir",
- "user_downloads_dir",
- "user_pictures_dir",
- "user_videos_dir",
- "user_music_dir",
"user_runtime_dir",
"site_data_dir",
"site_config_dir",
"site_cache_dir",
- "site_runtime_dir",
)
def main() -> None:
- """Run the main entry point."""
app_name = "MyApp"
app_author = "MyCompany"
- print(f"-- platformdirs {__version__} --") # noqa: T201
+ print(f"-- platformdirs {__version__} --")
- print("-- app dirs (with optional 'version')") # noqa: T201
+ print("-- app dirs (with optional 'version')")
dirs = PlatformDirs(app_name, app_author, version="1.0")
for prop in PROPS:
- print(f"{prop}: {getattr(dirs, prop)}") # noqa: T201
+ print(f"{prop}: {getattr(dirs, prop)}")
- print("\n-- app dirs (without optional 'version')") # noqa: T201
+ print("\n-- app dirs (without optional 'version')")
dirs = PlatformDirs(app_name, app_author)
for prop in PROPS:
- print(f"{prop}: {getattr(dirs, prop)}") # noqa: T201
+ print(f"{prop}: {getattr(dirs, prop)}")
- print("\n-- app dirs (without optional 'appauthor')") # noqa: T201
+ print("\n-- app dirs (without optional 'appauthor')")
dirs = PlatformDirs(app_name)
for prop in PROPS:
- print(f"{prop}: {getattr(dirs, prop)}") # noqa: T201
+ print(f"{prop}: {getattr(dirs, prop)}")
- print("\n-- app dirs (with disabled 'appauthor')") # noqa: T201
+ print("\n-- app dirs (with disabled 'appauthor')")
dirs = PlatformDirs(app_name, appauthor=False)
for prop in PROPS:
- print(f"{prop}: {getattr(dirs, prop)}") # noqa: T201
+ print(f"{prop}: {getattr(dirs, prop)}")
if __name__ == "__main__":
diff --git a/venv1/Lib/site-packages/pip/_vendor/platformdirs/android.py b/venv1/Lib/site-packages/pip/_vendor/platformdirs/android.py
index 92efc852..f6de7451 100644
--- a/venv1/Lib/site-packages/pip/_vendor/platformdirs/android.py
+++ b/venv1/Lib/site-packages/pip/_vendor/platformdirs/android.py
@@ -1,29 +1,26 @@
-"""Android."""
-
from __future__ import annotations
import os
import re
import sys
from functools import lru_cache
-from typing import TYPE_CHECKING, cast
+from typing import cast
from .api import PlatformDirsABC
class Android(PlatformDirsABC):
"""
- Follows the guidance `from here `_.
-
- Makes use of the `appname `, `version
- `, `ensure_exists `.
-
+ Follows the guidance `from here `_. Makes use of the
+ `appname `,
+ `version `,
+ `ensure_exists `.
"""
@property
def user_data_dir(self) -> str:
""":return: data directory tied to the user, e.g. ``/data/user///files/``"""
- return self._append_app_name_and_version(cast("str", _android_folder()), "files")
+ return self._append_app_name_and_version(cast(str, _android_folder()), "files")
@property
def site_data_dir(self) -> str:
@@ -33,10 +30,9 @@ def site_data_dir(self) -> str:
@property
def user_config_dir(self) -> str:
"""
- :return: config directory tied to the user, e.g. \
- ``/data/user///shared_prefs/``
+ :return: config directory tied to the user, e.g. ``/data/user///shared_prefs/``
"""
- return self._append_app_name_and_version(cast("str", _android_folder()), "shared_prefs")
+ return self._append_app_name_and_version(cast(str, _android_folder()), "shared_prefs")
@property
def site_config_dir(self) -> str:
@@ -45,8 +41,8 @@ def site_config_dir(self) -> str:
@property
def user_cache_dir(self) -> str:
- """:return: cache directory tied to the user, e.g.,``/data/user///cache/``"""
- return self._append_app_name_and_version(cast("str", _android_folder()), "cache")
+ """:return: cache directory tied to the user, e.g. e.g. ``/data/user///cache/``"""
+ return self._append_app_name_and_version(cast(str, _android_folder()), "cache")
@property
def site_cache_dir(self) -> str:
@@ -66,39 +62,16 @@ def user_log_dir(self) -> str:
"""
path = self.user_cache_dir
if self.opinion:
- path = os.path.join(path, "log") # noqa: PTH118
+ path = os.path.join(path, "log")
return path
@property
def user_documents_dir(self) -> str:
- """:return: documents directory tied to the user e.g. ``/storage/emulated/0/Documents``"""
+ """
+ :return: documents directory tied to the user e.g. ``/storage/emulated/0/Documents``
+ """
return _android_documents_folder()
- @property
- def user_downloads_dir(self) -> str:
- """:return: downloads directory tied to the user e.g. ``/storage/emulated/0/Downloads``"""
- return _android_downloads_folder()
-
- @property
- def user_pictures_dir(self) -> str:
- """:return: pictures directory tied to the user e.g. ``/storage/emulated/0/Pictures``"""
- return _android_pictures_folder()
-
- @property
- def user_videos_dir(self) -> str:
- """:return: videos directory tied to the user e.g. ``/storage/emulated/0/DCIM/Camera``"""
- return _android_videos_folder()
-
- @property
- def user_music_dir(self) -> str:
- """:return: music directory tied to the user e.g. ``/storage/emulated/0/Music``"""
- return _android_music_folder()
-
- @property
- def user_desktop_dir(self) -> str:
- """:return: desktop directory tied to the user e.g. ``/storage/emulated/0/Desktop``"""
- return "/storage/emulated/0/Desktop"
-
@property
def user_runtime_dir(self) -> str:
"""
@@ -107,43 +80,21 @@ def user_runtime_dir(self) -> str:
"""
path = self.user_cache_dir
if self.opinion:
- path = os.path.join(path, "tmp") # noqa: PTH118
+ path = os.path.join(path, "tmp")
return path
- @property
- def site_runtime_dir(self) -> str:
- """:return: runtime directory shared by users, same as `user_runtime_dir`"""
- return self.user_runtime_dir
-
@lru_cache(maxsize=1)
-def _android_folder() -> str | None: # noqa: C901
- """:return: base folder for the Android OS or None if it cannot be found"""
- result: str | None = None
- # type checker isn't happy with our "import android", just don't do this when type checking see
- # https://stackoverflow.com/a/61394121
- if not TYPE_CHECKING:
- try:
- # First try to get a path to android app using python4android (if available)...
- from android import mActivity # noqa: PLC0415
-
- context = cast("android.content.Context", mActivity.getApplicationContext()) # noqa: F821
- result = context.getFilesDir().getParentFile().getAbsolutePath()
- except Exception: # noqa: BLE001
- result = None
- if result is None:
- try:
- # ...and fall back to using plain pyjnius, if python4android isn't available or doesn't deliver any useful
- # result...
- from jnius import autoclass # noqa: PLC0415
-
- context = autoclass("android.content.Context")
- result = context.getFilesDir().getParentFile().getAbsolutePath()
- except Exception: # noqa: BLE001
- result = None
- if result is None:
- # and if that fails, too, find an android folder looking at path on the sys.path
- # warning: only works for apps installed under /data, not adopted storage etc.
+def _android_folder() -> str | None:
+ """:return: base folder for the Android OS or None if cannot be found"""
+ try:
+ # First try to get path to android app via pyjnius
+ from jnius import autoclass
+
+ Context = autoclass("android.content.Context") # noqa: N806
+ result: str | None = Context.getFilesDir().getParentFile().getAbsolutePath()
+ except Exception:
+ # if fails find an android folder looking path on the sys.path
pattern = re.compile(r"/data/(data|user/\d+)/(.+)/files")
for path in sys.path:
if pattern.match(path):
@@ -151,16 +102,6 @@ def _android_folder() -> str | None: # noqa: C901
break
else:
result = None
- if result is None:
- # one last try: find an android folder looking at path on the sys.path taking adopted storage paths into
- # account
- pattern = re.compile(r"/mnt/expand/[a-fA-F0-9-]{36}/(data|user/\d+)/(.+)/files")
- for path in sys.path:
- if pattern.match(path):
- result = path.split("/files")[0]
- break
- else:
- result = None
return result
@@ -169,81 +110,17 @@ def _android_documents_folder() -> str:
""":return: documents folder for the Android OS"""
# Get directories with pyjnius
try:
- from jnius import autoclass # noqa: PLC0415
+ from jnius import autoclass
- context = autoclass("android.content.Context")
- environment = autoclass("android.os.Environment")
- documents_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DOCUMENTS).getAbsolutePath()
- except Exception: # noqa: BLE001
+ Context = autoclass("android.content.Context") # noqa: N806
+ Environment = autoclass("android.os.Environment") # noqa: N806
+ documents_dir: str = Context.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getAbsolutePath()
+ except Exception:
documents_dir = "/storage/emulated/0/Documents"
return documents_dir
-@lru_cache(maxsize=1)
-def _android_downloads_folder() -> str:
- """:return: downloads folder for the Android OS"""
- # Get directories with pyjnius
- try:
- from jnius import autoclass # noqa: PLC0415
-
- context = autoclass("android.content.Context")
- environment = autoclass("android.os.Environment")
- downloads_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DOWNLOADS).getAbsolutePath()
- except Exception: # noqa: BLE001
- downloads_dir = "/storage/emulated/0/Downloads"
-
- return downloads_dir
-
-
-@lru_cache(maxsize=1)
-def _android_pictures_folder() -> str:
- """:return: pictures folder for the Android OS"""
- # Get directories with pyjnius
- try:
- from jnius import autoclass # noqa: PLC0415
-
- context = autoclass("android.content.Context")
- environment = autoclass("android.os.Environment")
- pictures_dir: str = context.getExternalFilesDir(environment.DIRECTORY_PICTURES).getAbsolutePath()
- except Exception: # noqa: BLE001
- pictures_dir = "/storage/emulated/0/Pictures"
-
- return pictures_dir
-
-
-@lru_cache(maxsize=1)
-def _android_videos_folder() -> str:
- """:return: videos folder for the Android OS"""
- # Get directories with pyjnius
- try:
- from jnius import autoclass # noqa: PLC0415
-
- context = autoclass("android.content.Context")
- environment = autoclass("android.os.Environment")
- videos_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DCIM).getAbsolutePath()
- except Exception: # noqa: BLE001
- videos_dir = "/storage/emulated/0/DCIM/Camera"
-
- return videos_dir
-
-
-@lru_cache(maxsize=1)
-def _android_music_folder() -> str:
- """:return: music folder for the Android OS"""
- # Get directories with pyjnius
- try:
- from jnius import autoclass # noqa: PLC0415
-
- context = autoclass("android.content.Context")
- environment = autoclass("android.os.Environment")
- music_dir: str = context.getExternalFilesDir(environment.DIRECTORY_MUSIC).getAbsolutePath()
- except Exception: # noqa: BLE001
- music_dir = "/storage/emulated/0/Music"
-
- return music_dir
-
-
__all__ = [
"Android",
]
diff --git a/venv1/Lib/site-packages/pip/_vendor/platformdirs/api.py b/venv1/Lib/site-packages/pip/_vendor/platformdirs/api.py
index 251600e6..f140e8b6 100644
--- a/venv1/Lib/site-packages/pip/_vendor/platformdirs/api.py
+++ b/venv1/Lib/site-packages/pip/_vendor/platformdirs/api.py
@@ -1,30 +1,29 @@
-"""Base API."""
-
from __future__ import annotations
import os
+import sys
from abc import ABC, abstractmethod
from pathlib import Path
-from typing import TYPE_CHECKING
-if TYPE_CHECKING:
- from collections.abc import Iterator
- from typing import Literal
+if sys.version_info >= (3, 8): # pragma: no branch
+ from typing import Literal # pragma: no cover
-class PlatformDirsABC(ABC): # noqa: PLR0904
- """Abstract base class for platform directories."""
+class PlatformDirsABC(ABC):
+ """
+ Abstract base class for platform directories.
+ """
- def __init__( # noqa: PLR0913, PLR0917
+ def __init__(
self,
appname: str | None = None,
- appauthor: str | Literal[False] | None = None,
+ appauthor: str | None | Literal[False] = None,
version: str | None = None,
- roaming: bool = False, # noqa: FBT001, FBT002
- multipath: bool = False, # noqa: FBT001, FBT002
- opinion: bool = True, # noqa: FBT001, FBT002
- ensure_exists: bool = False, # noqa: FBT001, FBT002
- ) -> None:
+ roaming: bool = False,
+ multipath: bool = False,
+ opinion: bool = True,
+ ensure_exists: bool = False,
+ ):
"""
Create a new platform directory.
@@ -35,47 +34,34 @@ def __init__( # noqa: PLR0913, PLR0917
:param multipath: See `multipath`.
:param opinion: See `opinion`.
:param ensure_exists: See `ensure_exists`.
-
"""
self.appname = appname #: The name of application.
self.appauthor = appauthor
"""
- The name of the app author or distributing body for this application.
-
- Typically, it is the owning company name. Defaults to `appname`. You may pass ``False`` to disable it.
-
+ The name of the app author or distributing body for this application. Typically, it is the owning company name.
+ Defaults to `appname`. You may pass ``False`` to disable it.
"""
self.version = version
"""
- An optional version path element to append to the path.
-
- You might want to use this if you want multiple versions of your app to be able to run independently. If used,
- this would typically be ``.``.
-
+ An optional version path element to append to the path. You might want to use this if you want multiple versions
+ of your app to be able to run independently. If used, this would typically be ``.``.
"""
self.roaming = roaming
"""
- Whether to use the roaming appdata directory on Windows.
-
- That means that for users on a Windows network setup for roaming profiles, this user data will be synced on
- login (see
- `here `_).
-
+ Whether to use the roaming appdata directory on Windows. That means that for users on a Windows network setup
+ for roaming profiles, this user data will be synced on login (see
+ `here `_).
"""
self.multipath = multipath
"""
- An optional parameter which indicates that the entire list of data dirs should be returned.
-
- By default, the first item would only be returned.
-
+ An optional parameter only applicable to Unix/Linux which indicates that the entire list of data dirs should be
+ returned. By default, the first item would only be returned.
"""
self.opinion = opinion #: A flag to indicating to use opinionated values.
self.ensure_exists = ensure_exists
"""
Optionally create the directory (and any missing parents) upon access if it does not exist.
-
By default, no directories are created.
-
"""
def _append_app_name_and_version(self, *base: str) -> str:
@@ -84,7 +70,7 @@ def _append_app_name_and_version(self, *base: str) -> str:
params.append(self.appname)
if self.version:
params.append(self.version)
- path = os.path.join(base[0], *params) # noqa: PTH118
+ path = os.path.join(base[0], *params)
self._optionally_create_directory(path)
return path
@@ -92,12 +78,6 @@ def _optionally_create_directory(self, path: str) -> None:
if self.ensure_exists:
Path(path).mkdir(parents=True, exist_ok=True)
- def _first_item_as_path_if_multipath(self, directory: str) -> Path:
- if self.multipath:
- # If multipath is True, the first path is returned.
- directory = directory.partition(os.pathsep)[0]
- return Path(directory)
-
@property
@abstractmethod
def user_data_dir(self) -> str:
@@ -143,41 +123,11 @@ def user_log_dir(self) -> str:
def user_documents_dir(self) -> str:
""":return: documents directory tied to the user"""
- @property
- @abstractmethod
- def user_downloads_dir(self) -> str:
- """:return: downloads directory tied to the user"""
-
- @property
- @abstractmethod
- def user_pictures_dir(self) -> str:
- """:return: pictures directory tied to the user"""
-
- @property
- @abstractmethod
- def user_videos_dir(self) -> str:
- """:return: videos directory tied to the user"""
-
- @property
- @abstractmethod
- def user_music_dir(self) -> str:
- """:return: music directory tied to the user"""
-
- @property
- @abstractmethod
- def user_desktop_dir(self) -> str:
- """:return: desktop directory tied to the user"""
-
@property
@abstractmethod
def user_runtime_dir(self) -> str:
""":return: runtime directory tied to the user"""
- @property
- @abstractmethod
- def site_runtime_dir(self) -> str:
- """:return: runtime directory shared by users"""
-
@property
def user_data_path(self) -> Path:
""":return: data path tied to the user"""
@@ -220,80 +170,10 @@ def user_log_path(self) -> Path:
@property
def user_documents_path(self) -> Path:
- """:return: documents a path tied to the user"""
+ """:return: documents path tied to the user"""
return Path(self.user_documents_dir)
- @property
- def user_downloads_path(self) -> Path:
- """:return: downloads path tied to the user"""
- return Path(self.user_downloads_dir)
-
- @property
- def user_pictures_path(self) -> Path:
- """:return: pictures path tied to the user"""
- return Path(self.user_pictures_dir)
-
- @property
- def user_videos_path(self) -> Path:
- """:return: videos path tied to the user"""
- return Path(self.user_videos_dir)
-
- @property
- def user_music_path(self) -> Path:
- """:return: music path tied to the user"""
- return Path(self.user_music_dir)
-
- @property
- def user_desktop_path(self) -> Path:
- """:return: desktop path tied to the user"""
- return Path(self.user_desktop_dir)
-
@property
def user_runtime_path(self) -> Path:
""":return: runtime path tied to the user"""
return Path(self.user_runtime_dir)
-
- @property
- def site_runtime_path(self) -> Path:
- """:return: runtime path shared by users"""
- return Path(self.site_runtime_dir)
-
- def iter_config_dirs(self) -> Iterator[str]:
- """:yield: all user and site configuration directories."""
- yield self.user_config_dir
- yield self.site_config_dir
-
- def iter_data_dirs(self) -> Iterator[str]:
- """:yield: all user and site data directories."""
- yield self.user_data_dir
- yield self.site_data_dir
-
- def iter_cache_dirs(self) -> Iterator[str]:
- """:yield: all user and site cache directories."""
- yield self.user_cache_dir
- yield self.site_cache_dir
-
- def iter_runtime_dirs(self) -> Iterator[str]:
- """:yield: all user and site runtime directories."""
- yield self.user_runtime_dir
- yield self.site_runtime_dir
-
- def iter_config_paths(self) -> Iterator[Path]:
- """:yield: all user and site configuration paths."""
- for path in self.iter_config_dirs():
- yield Path(path)
-
- def iter_data_paths(self) -> Iterator[Path]:
- """:yield: all user and site data paths."""
- for path in self.iter_data_dirs():
- yield Path(path)
-
- def iter_cache_paths(self) -> Iterator[Path]:
- """:yield: all user and site cache paths."""
- for path in self.iter_cache_dirs():
- yield Path(path)
-
- def iter_runtime_paths(self) -> Iterator[Path]:
- """:yield: all user and site runtime paths."""
- for path in self.iter_runtime_dirs():
- yield Path(path)
diff --git a/venv1/Lib/site-packages/pip/_vendor/platformdirs/macos.py b/venv1/Lib/site-packages/pip/_vendor/platformdirs/macos.py
index 30ab3689..ec975112 100644
--- a/venv1/Lib/site-packages/pip/_vendor/platformdirs/macos.py
+++ b/venv1/Lib/site-packages/pip/_vendor/platformdirs/macos.py
@@ -1,56 +1,28 @@
-"""macOS."""
-
from __future__ import annotations
-import os.path
-import sys
-from typing import TYPE_CHECKING
+import os
from .api import PlatformDirsABC
-if TYPE_CHECKING:
- from pathlib import Path
-
class MacOS(PlatformDirsABC):
"""
- Platform directories for the macOS operating system.
-
- Follows the guidance from
- `Apple documentation `_.
+ Platform directories for the macOS operating system. Follows the guidance from `Apple documentation
+ `_.
Makes use of the `appname `,
`version `,
`ensure_exists `.
-
"""
@property
def user_data_dir(self) -> str:
""":return: data directory tied to the user, e.g. ``~/Library/Application Support/$appname/$version``"""
- return self._append_app_name_and_version(os.path.expanduser("~/Library/Application Support")) # noqa: PTH111
+ return self._append_app_name_and_version(os.path.expanduser("~/Library/Application Support"))
@property
def site_data_dir(self) -> str:
- """
- :return: data directory shared by users, e.g. ``/Library/Application Support/$appname/$version``.
- If we're using a Python binary managed by `Homebrew `_, the directory
- will be under the Homebrew prefix, e.g. ``$homebrew_prefix/share/$appname/$version``.
- If `multipath ` is enabled, and we're in Homebrew,
- the response is a multi-path string separated by ":", e.g.
- ``$homebrew_prefix/share/$appname/$version:/Library/Application Support/$appname/$version``
- """
- is_homebrew = "/opt/python" in sys.prefix
- homebrew_prefix = sys.prefix.split("/opt/python")[0] if is_homebrew else ""
- path_list = [self._append_app_name_and_version(f"{homebrew_prefix}/share")] if is_homebrew else []
- path_list.append(self._append_app_name_and_version("/Library/Application Support"))
- if self.multipath:
- return os.pathsep.join(path_list)
- return path_list[0]
-
- @property
- def site_data_path(self) -> Path:
- """:return: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
- return self._first_item_as_path_if_multipath(self.site_data_dir)
+ """:return: data directory shared by users, e.g. ``/Library/Application Support/$appname/$version``"""
+ return self._append_app_name_and_version("/Library/Application Support")
@property
def user_config_dir(self) -> str:
@@ -65,30 +37,12 @@ def site_config_dir(self) -> str:
@property
def user_cache_dir(self) -> str:
""":return: cache directory tied to the user, e.g. ``~/Library/Caches/$appname/$version``"""
- return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches")) # noqa: PTH111
+ return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches"))
@property
def site_cache_dir(self) -> str:
- """
- :return: cache directory shared by users, e.g. ``/Library/Caches/$appname/$version``.
- If we're using a Python binary managed by `Homebrew `_, the directory
- will be under the Homebrew prefix, e.g. ``$homebrew_prefix/var/cache/$appname/$version``.
- If `multipath ` is enabled, and we're in Homebrew,
- the response is a multi-path string separated by ":", e.g.
- ``$homebrew_prefix/var/cache/$appname/$version:/Library/Caches/$appname/$version``
- """
- is_homebrew = "/opt/python" in sys.prefix
- homebrew_prefix = sys.prefix.split("/opt/python")[0] if is_homebrew else ""
- path_list = [self._append_app_name_and_version(f"{homebrew_prefix}/var/cache")] if is_homebrew else []
- path_list.append(self._append_app_name_and_version("/Library/Caches"))
- if self.multipath:
- return os.pathsep.join(path_list)
- return path_list[0]
-
- @property
- def site_cache_path(self) -> Path:
- """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
- return self._first_item_as_path_if_multipath(self.site_cache_dir)
+ """:return: cache directory shared by users, e.g. ``/Library/Caches/$appname/$version``"""
+ return self._append_app_name_and_version("/Library/Caches")
@property
def user_state_dir(self) -> str:
@@ -98,47 +52,17 @@ def user_state_dir(self) -> str:
@property
def user_log_dir(self) -> str:
""":return: log directory tied to the user, e.g. ``~/Library/Logs/$appname/$version``"""
- return self._append_app_name_and_version(os.path.expanduser("~/Library/Logs")) # noqa: PTH111
+ return self._append_app_name_and_version(os.path.expanduser("~/Library/Logs"))
@property
def user_documents_dir(self) -> str:
""":return: documents directory tied to the user, e.g. ``~/Documents``"""
- return os.path.expanduser("~/Documents") # noqa: PTH111
-
- @property
- def user_downloads_dir(self) -> str:
- """:return: downloads directory tied to the user, e.g. ``~/Downloads``"""
- return os.path.expanduser("~/Downloads") # noqa: PTH111
-
- @property
- def user_pictures_dir(self) -> str:
- """:return: pictures directory tied to the user, e.g. ``~/Pictures``"""
- return os.path.expanduser("~/Pictures") # noqa: PTH111
-
- @property
- def user_videos_dir(self) -> str:
- """:return: videos directory tied to the user, e.g. ``~/Movies``"""
- return os.path.expanduser("~/Movies") # noqa: PTH111
-
- @property
- def user_music_dir(self) -> str:
- """:return: music directory tied to the user, e.g. ``~/Music``"""
- return os.path.expanduser("~/Music") # noqa: PTH111
-
- @property
- def user_desktop_dir(self) -> str:
- """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
- return os.path.expanduser("~/Desktop") # noqa: PTH111
+ return os.path.expanduser("~/Documents")
@property
def user_runtime_dir(self) -> str:
""":return: runtime directory tied to the user, e.g. ``~/Library/Caches/TemporaryItems/$appname/$version``"""
- return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches/TemporaryItems")) # noqa: PTH111
-
- @property
- def site_runtime_dir(self) -> str:
- """:return: runtime directory shared by users, same as `user_runtime_dir`"""
- return self.user_runtime_dir
+ return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches/TemporaryItems"))
__all__ = [
diff --git a/venv1/Lib/site-packages/pip/_vendor/platformdirs/py.typed b/venv1/Lib/site-packages/pip/_vendor/platformdirs/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/venv1/Lib/site-packages/pip/_vendor/platformdirs/unix.py b/venv1/Lib/site-packages/pip/_vendor/platformdirs/unix.py
index fc75d8d0..17d355da 100644
--- a/venv1/Lib/site-packages/pip/_vendor/platformdirs/unix.py
+++ b/venv1/Lib/site-packages/pip/_vendor/platformdirs/unix.py
@@ -1,39 +1,31 @@
-"""Unix."""
-
from __future__ import annotations
import os
import sys
from configparser import ConfigParser
from pathlib import Path
-from typing import TYPE_CHECKING, NoReturn
from .api import PlatformDirsABC
-if TYPE_CHECKING:
- from collections.abc import Iterator
-
-if sys.platform == "win32":
-
- def getuid() -> NoReturn:
- msg = "should only be used on Unix"
- raise RuntimeError(msg)
-
-else:
+if sys.platform.startswith("linux"): # pragma: no branch # no op check, only to please the type checker
from os import getuid
+else:
+ def getuid() -> int:
+ raise RuntimeError("should only be used on Linux")
-class Unix(PlatformDirsABC): # noqa: PLR0904
- """
- On Unix/Linux, we follow the `XDG Basedir Spec `_.
-
- The spec allows overriding directories with environment variables. The examples shown are the default values,
- alongside the name of the environment variable that overrides them. Makes use of the `appname
- `, `version `, `multipath
- `, `opinion `, `ensure_exists
- `.
+class Unix(PlatformDirsABC):
+ """
+ On Unix/Linux, we follow the
+ `XDG Basedir Spec `_. The spec allows
+ overriding directories with environment variables. The examples show are the default values, alongside the name of
+ the environment variable that overrides them. Makes use of the
+ `appname `,
+ `version `,
+ `multipath `,
+ `opinion `,
+ `ensure_exists `.
"""
@property
@@ -44,28 +36,28 @@ def user_data_dir(self) -> str:
"""
path = os.environ.get("XDG_DATA_HOME", "")
if not path.strip():
- path = os.path.expanduser("~/.local/share") # noqa: PTH111
+ path = os.path.expanduser("~/.local/share")
return self._append_app_name_and_version(path)
- @property
- def _site_data_dirs(self) -> list[str]:
- path = os.environ.get("XDG_DATA_DIRS", "")
- if not path.strip():
- path = f"/usr/local/share{os.pathsep}/usr/share"
- return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
-
@property
def site_data_dir(self) -> str:
"""
:return: data directories shared by users (if `multipath ` is
- enabled and ``XDG_DATA_DIRS`` is set and a multi path the response is also a multi path separated by the
- OS path separator), e.g. ``/usr/local/share/$appname/$version`` or ``/usr/share/$appname/$version``
+ enabled and ``XDG_DATA_DIR`` is set and a multi path the response is also a multi path separated by the OS
+ path separator), e.g. ``/usr/local/share/$appname/$version`` or ``/usr/share/$appname/$version``
"""
# XDG default for $XDG_DATA_DIRS; only first, if multipath is False
- dirs = self._site_data_dirs
+ path = os.environ.get("XDG_DATA_DIRS", "")
+ if not path.strip():
+ path = f"/usr/local/share{os.pathsep}/usr/share"
+ return self._with_multi_path(path)
+
+ def _with_multi_path(self, path: str) -> str:
+ path_list = path.split(os.pathsep)
if not self.multipath:
- return dirs[0]
- return os.pathsep.join(dirs)
+ path_list = path_list[0:1]
+ path_list = [self._append_app_name_and_version(os.path.expanduser(p)) for p in path_list]
+ return os.pathsep.join(path_list)
@property
def user_config_dir(self) -> str:
@@ -75,28 +67,21 @@ def user_config_dir(self) -> str:
"""
path = os.environ.get("XDG_CONFIG_HOME", "")
if not path.strip():
- path = os.path.expanduser("~/.config") # noqa: PTH111
+ path = os.path.expanduser("~/.config")
return self._append_app_name_and_version(path)
- @property
- def _site_config_dirs(self) -> list[str]:
- path = os.environ.get("XDG_CONFIG_DIRS", "")
- if not path.strip():
- path = "/etc/xdg"
- return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
-
@property
def site_config_dir(self) -> str:
"""
:return: config directories shared by users (if `multipath `
- is enabled and ``XDG_CONFIG_DIRS`` is set and a multi path the response is also a multi path separated by
- the OS path separator), e.g. ``/etc/xdg/$appname/$version``
+ is enabled and ``XDG_DATA_DIR`` is set and a multi path the response is also a multi path separated by the OS
+ path separator), e.g. ``/etc/xdg/$appname/$version``
"""
# XDG default for $XDG_CONFIG_DIRS only first, if multipath is False
- dirs = self._site_config_dirs
- if not self.multipath:
- return dirs[0]
- return os.pathsep.join(dirs)
+ path = os.environ.get("XDG_CONFIG_DIRS", "")
+ if not path.strip():
+ path = "/etc/xdg"
+ return self._with_multi_path(path)
@property
def user_cache_dir(self) -> str:
@@ -106,13 +91,15 @@ def user_cache_dir(self) -> str:
"""
path = os.environ.get("XDG_CACHE_HOME", "")
if not path.strip():
- path = os.path.expanduser("~/.cache") # noqa: PTH111
+ path = os.path.expanduser("~/.cache")
return self._append_app_name_and_version(path)
@property
def site_cache_dir(self) -> str:
- """:return: cache directory shared by users, e.g. ``/var/cache/$appname/$version``"""
- return self._append_app_name_and_version("/var/cache")
+ """
+ :return: cache directory shared by users, e.g. ``/var/tmp/$appname/$version``
+ """
+ return self._append_app_name_and_version("/var/tmp")
@property
def user_state_dir(self) -> str:
@@ -122,138 +109,72 @@ def user_state_dir(self) -> str:
"""
path = os.environ.get("XDG_STATE_HOME", "")
if not path.strip():
- path = os.path.expanduser("~/.local/state") # noqa: PTH111
+ path = os.path.expanduser("~/.local/state")
return self._append_app_name_and_version(path)
@property
def user_log_dir(self) -> str:
- """:return: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it"""
+ """
+ :return: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it
+ """
path = self.user_state_dir
if self.opinion:
- path = os.path.join(path, "log") # noqa: PTH118
- self._optionally_create_directory(path)
+ path = os.path.join(path, "log")
return path
@property
def user_documents_dir(self) -> str:
- """:return: documents directory tied to the user, e.g. ``~/Documents``"""
- return _get_user_media_dir("XDG_DOCUMENTS_DIR", "~/Documents")
-
- @property
- def user_downloads_dir(self) -> str:
- """:return: downloads directory tied to the user, e.g. ``~/Downloads``"""
- return _get_user_media_dir("XDG_DOWNLOAD_DIR", "~/Downloads")
-
- @property
- def user_pictures_dir(self) -> str:
- """:return: pictures directory tied to the user, e.g. ``~/Pictures``"""
- return _get_user_media_dir("XDG_PICTURES_DIR", "~/Pictures")
-
- @property
- def user_videos_dir(self) -> str:
- """:return: videos directory tied to the user, e.g. ``~/Videos``"""
- return _get_user_media_dir("XDG_VIDEOS_DIR", "~/Videos")
-
- @property
- def user_music_dir(self) -> str:
- """:return: music directory tied to the user, e.g. ``~/Music``"""
- return _get_user_media_dir("XDG_MUSIC_DIR", "~/Music")
+ """
+ :return: documents directory tied to the user, e.g. ``~/Documents``
+ """
+ documents_dir = _get_user_dirs_folder("XDG_DOCUMENTS_DIR")
+ if documents_dir is None:
+ documents_dir = os.environ.get("XDG_DOCUMENTS_DIR", "").strip()
+ if not documents_dir:
+ documents_dir = os.path.expanduser("~/Documents")
- @property
- def user_desktop_dir(self) -> str:
- """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
- return _get_user_media_dir("XDG_DESKTOP_DIR", "~/Desktop")
+ return documents_dir
@property
def user_runtime_dir(self) -> str:
"""
:return: runtime directory tied to the user, e.g. ``/run/user/$(id -u)/$appname/$version`` or
- ``$XDG_RUNTIME_DIR/$appname/$version``.
-
- For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/user/$(id -u)/$appname/$version`` if
- exists, otherwise ``/tmp/runtime-$(id -u)/$appname/$version``, if``$XDG_RUNTIME_DIR``
- is not set.
+ ``$XDG_RUNTIME_DIR/$appname/$version``
"""
path = os.environ.get("XDG_RUNTIME_DIR", "")
if not path.strip():
- if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
- path = f"/var/run/user/{getuid()}"
- if not Path(path).exists():
- path = f"/tmp/runtime-{getuid()}" # noqa: S108
- else:
- path = f"/run/user/{getuid()}"
- return self._append_app_name_and_version(path)
-
- @property
- def site_runtime_dir(self) -> str:
- """
- :return: runtime directory shared by users, e.g. ``/run/$appname/$version`` or \
- ``$XDG_RUNTIME_DIR/$appname/$version``.
-
- Note that this behaves almost exactly like `user_runtime_dir` if ``$XDG_RUNTIME_DIR`` is set, but will
- fall back to paths associated to the root user instead of a regular logged-in user if it's not set.
-
- If you wish to ensure that a logged-in root user path is returned e.g. ``/run/user/0``, use `user_runtime_dir`
- instead.
-
- For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/$appname/$version`` if ``$XDG_RUNTIME_DIR`` is not set.
- """
- path = os.environ.get("XDG_RUNTIME_DIR", "")
- if not path.strip():
- if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
- path = "/var/run"
- else:
- path = "/run"
+ path = f"/run/user/{getuid()}"
return self._append_app_name_and_version(path)
@property
def site_data_path(self) -> Path:
- """:return: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
+ """:return: data path shared by users. Only return first item, even if ``multipath`` is set to ``True``"""
return self._first_item_as_path_if_multipath(self.site_data_dir)
@property
def site_config_path(self) -> Path:
- """:return: config path shared by the users, returns the first item, even if ``multipath`` is set to ``True``"""
+ """:return: config path shared by the users. Only return first item, even if ``multipath`` is set to ``True``"""
return self._first_item_as_path_if_multipath(self.site_config_dir)
@property
def site_cache_path(self) -> Path:
- """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
+ """:return: cache path shared by users. Only return first item, even if ``multipath`` is set to ``True``"""
return self._first_item_as_path_if_multipath(self.site_cache_dir)
- def iter_config_dirs(self) -> Iterator[str]:
- """:yield: all user and site configuration directories."""
- yield self.user_config_dir
- yield from self._site_config_dirs
-
- def iter_data_dirs(self) -> Iterator[str]:
- """:yield: all user and site data directories."""
- yield self.user_data_dir
- yield from self._site_data_dirs
-
-
-def _get_user_media_dir(env_var: str, fallback_tilde_path: str) -> str:
- media_dir = _get_user_dirs_folder(env_var)
- if media_dir is None:
- media_dir = os.environ.get(env_var, "").strip()
- if not media_dir:
- media_dir = os.path.expanduser(fallback_tilde_path) # noqa: PTH111
-
- return media_dir
+ def _first_item_as_path_if_multipath(self, directory: str) -> Path:
+ if self.multipath:
+ # If multipath is True, the first path is returned.
+ directory = directory.split(os.pathsep)[0]
+ return Path(directory)
def _get_user_dirs_folder(key: str) -> str | None:
- """
- Return directory from user-dirs.dirs config file.
-
- See https://freedesktop.org/wiki/Software/xdg-user-dirs/.
-
- """
- user_dirs_config_path = Path(Unix().user_config_dir) / "user-dirs.dirs"
- if user_dirs_config_path.exists():
+ """Return directory from user-dirs.dirs config file. See https://freedesktop.org/wiki/Software/xdg-user-dirs/"""
+ user_dirs_config_path = os.path.join(Unix().user_config_dir, "user-dirs.dirs")
+ if os.path.exists(user_dirs_config_path):
parser = ConfigParser()
- with user_dirs_config_path.open() as stream:
+ with open(user_dirs_config_path) as stream:
# Add fake section header, so ConfigParser doesn't complain
parser.read_string(f"[top]\n{stream.read()}")
@@ -262,7 +183,8 @@ def _get_user_dirs_folder(key: str) -> str | None:
path = parser["top"][key].strip('"')
# Handle relative home paths
- return path.replace("$HOME", os.path.expanduser("~")) # noqa: PTH111
+ path = path.replace("$HOME", os.path.expanduser("~"))
+ return path
return None
diff --git a/venv1/Lib/site-packages/pip/_vendor/platformdirs/version.py b/venv1/Lib/site-packages/pip/_vendor/platformdirs/version.py
index 35752825..d906a2c9 100644
--- a/venv1/Lib/site-packages/pip/_vendor/platformdirs/version.py
+++ b/venv1/Lib/site-packages/pip/_vendor/platformdirs/version.py
@@ -1,34 +1,4 @@
-# file generated by setuptools-scm
+# file generated by setuptools_scm
# don't change, don't track in version control
-
-__all__ = [
- "__version__",
- "__version_tuple__",
- "version",
- "version_tuple",
- "__commit_id__",
- "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
- from typing import Tuple
- from typing import Union
-
- VERSION_TUPLE = Tuple[Union[int, str], ...]
- COMMIT_ID = Union[str, None]
-else:
- VERSION_TUPLE = object
- COMMIT_ID = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
-
-__version__ = version = '4.5.0'
-__version_tuple__ = version_tuple = (4, 5, 0)
-
-__commit_id__ = commit_id = None
+__version__ = version = '3.2.0'
+__version_tuple__ = version_tuple = (3, 2, 0)
diff --git a/venv1/Lib/site-packages/pip/_vendor/platformdirs/windows.py b/venv1/Lib/site-packages/pip/_vendor/platformdirs/windows.py
index d7bc9609..e7573c3d 100644
--- a/venv1/Lib/site-packages/pip/_vendor/platformdirs/windows.py
+++ b/venv1/Lib/site-packages/pip/_vendor/platformdirs/windows.py
@@ -1,27 +1,24 @@
-"""Windows."""
-
from __future__ import annotations
+import ctypes
import os
import sys
from functools import lru_cache
-from typing import TYPE_CHECKING
+from typing import Callable
from .api import PlatformDirsABC
-if TYPE_CHECKING:
- from collections.abc import Callable
-
class Windows(PlatformDirsABC):
- """
- `MSDN on where to store app data files `_.
-
- Makes use of the `appname `, `appauthor
- `, `version `, `roaming
- `, `opinion `, `ensure_exists
- `.
-
+ """`MSDN on where to store app data files
+ `_.
+ Makes use of the
+ `appname `,
+ `appauthor `,
+ `version `,
+ `roaming `,
+ `opinion `,
+ `ensure_exists `.
"""
@property
@@ -46,7 +43,7 @@ def _append_parts(self, path: str, *, opinion_value: str | None = None) -> str:
params.append(opinion_value)
if self.version:
params.append(self.version)
- path = os.path.join(path, *params) # noqa: PTH118
+ path = os.path.join(path, *params)
self._optionally_create_directory(path)
return path
@@ -88,63 +85,36 @@ def user_state_dir(self) -> str:
@property
def user_log_dir(self) -> str:
- """:return: log directory tied to the user, same as `user_data_dir` if not opinionated else ``Logs`` in it"""
+ """
+ :return: log directory tied to the user, same as `user_data_dir` if not opinionated else ``Logs`` in it
+ """
path = self.user_data_dir
if self.opinion:
- path = os.path.join(path, "Logs") # noqa: PTH118
+ path = os.path.join(path, "Logs")
self._optionally_create_directory(path)
return path
@property
def user_documents_dir(self) -> str:
- """:return: documents directory tied to the user e.g. ``%USERPROFILE%\\Documents``"""
+ """
+ :return: documents directory tied to the user e.g. ``%USERPROFILE%\\Documents``
+ """
return os.path.normpath(get_win_folder("CSIDL_PERSONAL"))
- @property
- def user_downloads_dir(self) -> str:
- """:return: downloads directory tied to the user e.g. ``%USERPROFILE%\\Downloads``"""
- return os.path.normpath(get_win_folder("CSIDL_DOWNLOADS"))
-
- @property
- def user_pictures_dir(self) -> str:
- """:return: pictures directory tied to the user e.g. ``%USERPROFILE%\\Pictures``"""
- return os.path.normpath(get_win_folder("CSIDL_MYPICTURES"))
-
- @property
- def user_videos_dir(self) -> str:
- """:return: videos directory tied to the user e.g. ``%USERPROFILE%\\Videos``"""
- return os.path.normpath(get_win_folder("CSIDL_MYVIDEO"))
-
- @property
- def user_music_dir(self) -> str:
- """:return: music directory tied to the user e.g. ``%USERPROFILE%\\Music``"""
- return os.path.normpath(get_win_folder("CSIDL_MYMUSIC"))
-
- @property
- def user_desktop_dir(self) -> str:
- """:return: desktop directory tied to the user, e.g. ``%USERPROFILE%\\Desktop``"""
- return os.path.normpath(get_win_folder("CSIDL_DESKTOPDIRECTORY"))
-
@property
def user_runtime_dir(self) -> str:
"""
:return: runtime directory tied to the user, e.g.
``%USERPROFILE%\\AppData\\Local\\Temp\\$appauthor\\$appname``
"""
- path = os.path.normpath(os.path.join(get_win_folder("CSIDL_LOCAL_APPDATA"), "Temp")) # noqa: PTH118
+ path = os.path.normpath(os.path.join(get_win_folder("CSIDL_LOCAL_APPDATA"), "Temp"))
return self._append_parts(path)
- @property
- def site_runtime_dir(self) -> str:
- """:return: runtime directory shared by users, same as `user_runtime_dir`"""
- return self.user_runtime_dir
-
def get_win_folder_from_env_vars(csidl_name: str) -> str:
"""Get folder from environment variables."""
- result = get_win_folder_if_csidl_name_not_env_var(csidl_name)
- if result is not None:
- return result
+ if csidl_name == "CSIDL_PERSONAL": # does not have an environment name
+ return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Documents")
env_var_name = {
"CSIDL_APPDATA": "APPDATA",
@@ -152,58 +122,31 @@ def get_win_folder_from_env_vars(csidl_name: str) -> str:
"CSIDL_LOCAL_APPDATA": "LOCALAPPDATA",
}.get(csidl_name)
if env_var_name is None:
- msg = f"Unknown CSIDL name: {csidl_name}"
- raise ValueError(msg)
+ raise ValueError(f"Unknown CSIDL name: {csidl_name}")
result = os.environ.get(env_var_name)
if result is None:
- msg = f"Unset environment variable: {env_var_name}"
- raise ValueError(msg)
+ raise ValueError(f"Unset environment variable: {env_var_name}")
return result
-def get_win_folder_if_csidl_name_not_env_var(csidl_name: str) -> str | None:
- """Get a folder for a CSIDL name that does not exist as an environment variable."""
- if csidl_name == "CSIDL_PERSONAL":
- return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Documents") # noqa: PTH118
-
- if csidl_name == "CSIDL_DOWNLOADS":
- return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Downloads") # noqa: PTH118
-
- if csidl_name == "CSIDL_MYPICTURES":
- return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Pictures") # noqa: PTH118
-
- if csidl_name == "CSIDL_MYVIDEO":
- return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Videos") # noqa: PTH118
-
- if csidl_name == "CSIDL_MYMUSIC":
- return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Music") # noqa: PTH118
- return None
-
-
def get_win_folder_from_registry(csidl_name: str) -> str:
- """
- Get folder from the registry.
-
- This is a fallback technique at best. I'm not sure if using the registry for these guarantees us the correct answer
- for all CSIDL_* names.
+ """Get folder from the registry.
+ This is a fallback technique at best. I'm not sure if using the
+ registry for this guarantees us the correct answer for all CSIDL_*
+ names.
"""
shell_folder_name = {
"CSIDL_APPDATA": "AppData",
"CSIDL_COMMON_APPDATA": "Common AppData",
"CSIDL_LOCAL_APPDATA": "Local AppData",
"CSIDL_PERSONAL": "Personal",
- "CSIDL_DOWNLOADS": "{374DE290-123F-4565-9164-39C4925E467B}",
- "CSIDL_MYPICTURES": "My Pictures",
- "CSIDL_MYVIDEO": "My Video",
- "CSIDL_MYMUSIC": "My Music",
}.get(csidl_name)
if shell_folder_name is None:
- msg = f"Unknown CSIDL name: {csidl_name}"
- raise ValueError(msg)
+ raise ValueError(f"Unknown CSIDL name: {csidl_name}")
if sys.platform != "win32": # only needed for mypy type checker to know that this code runs only on Windows
raise NotImplementedError
- import winreg # noqa: PLC0415
+ import winreg
key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
directory, _ = winreg.QueryValueEx(key, shell_folder_name)
@@ -212,53 +155,33 @@ def get_win_folder_from_registry(csidl_name: str) -> str:
def get_win_folder_via_ctypes(csidl_name: str) -> str:
"""Get folder with ctypes."""
- # There is no 'CSIDL_DOWNLOADS'.
- # Use 'CSIDL_PROFILE' (40) and append the default folder 'Downloads' instead.
- # https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid
-
- import ctypes # noqa: PLC0415
-
csidl_const = {
"CSIDL_APPDATA": 26,
"CSIDL_COMMON_APPDATA": 35,
"CSIDL_LOCAL_APPDATA": 28,
"CSIDL_PERSONAL": 5,
- "CSIDL_MYPICTURES": 39,
- "CSIDL_MYVIDEO": 14,
- "CSIDL_MYMUSIC": 13,
- "CSIDL_DOWNLOADS": 40,
- "CSIDL_DESKTOPDIRECTORY": 16,
}.get(csidl_name)
if csidl_const is None:
- msg = f"Unknown CSIDL name: {csidl_name}"
- raise ValueError(msg)
+ raise ValueError(f"Unknown CSIDL name: {csidl_name}")
buf = ctypes.create_unicode_buffer(1024)
windll = getattr(ctypes, "windll") # noqa: B009 # using getattr to avoid false positive with mypy type checker
windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf)
- # Downgrade to short path name if it has high-bit chars.
- if any(ord(c) > 255 for c in buf): # noqa: PLR2004
+ # Downgrade to short path name if it has highbit chars.
+ if any(ord(c) > 255 for c in buf):
buf2 = ctypes.create_unicode_buffer(1024)
if windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024):
buf = buf2
- if csidl_name == "CSIDL_DOWNLOADS":
- return os.path.join(buf.value, "Downloads") # noqa: PTH118
-
return buf.value
def _pick_get_win_folder() -> Callable[[str], str]:
+ if hasattr(ctypes, "windll"):
+ return get_win_folder_via_ctypes
try:
- import ctypes # noqa: PLC0415
- except ImportError:
- pass
- else:
- if hasattr(ctypes, "windll"):
- return get_win_folder_via_ctypes
- try:
- import winreg # noqa: PLC0415, F401
+ import winreg # noqa: F401
except ImportError:
return get_win_folder_from_env_vars
else:
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/__init__.py b/venv1/Lib/site-packages/pip/_vendor/pygments/__init__.py
index cb229c98..d9b0a8de 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/__init__.py
@@ -21,12 +21,12 @@
.. _Pygments master branch:
https://github.com/pygments/pygments/archive/master.zip#egg=Pygments-dev
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
from io import StringIO, BytesIO
-__version__ = '2.19.2'
+__version__ = '2.14.0'
__docformat__ = 'restructuredtext'
__all__ = ['lex', 'format', 'highlight']
@@ -34,9 +34,7 @@
def lex(code, lexer):
"""
- Lex `code` with the `lexer` (must be a `Lexer` instance)
- and return an iterable of tokens. Currently, this only calls
- `lexer.get_tokens()`.
+ Lex ``code`` with ``lexer`` and return an iterable of tokens.
"""
try:
return lexer.get_tokens(code)
@@ -51,12 +49,11 @@ def lex(code, lexer):
def format(tokens, formatter, outfile=None): # pylint: disable=redefined-builtin
"""
- Format ``tokens`` (an iterable of tokens) with the formatter ``formatter``
- (a `Formatter` instance).
+ Format a tokenlist ``tokens`` with the formatter ``formatter``.
- If ``outfile`` is given and a valid file object (an object with a
- ``write`` method), the result will be written to it, otherwise it
- is returned as a string.
+ If ``outfile`` is given and a valid file object (an object
+ with a ``write`` method), the result will be written to it, otherwise
+ it is returned as a string.
"""
try:
if not outfile:
@@ -76,7 +73,10 @@ def format(tokens, formatter, outfile=None): # pylint: disable=redefined-builti
def highlight(code, lexer, formatter, outfile=None):
"""
- This is the most high-level highlighting function. It combines `lex` and
- `format` in one function.
+ Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``.
+
+ If ``outfile`` is given and a valid file object (an object
+ with a ``write`` method), the result will be written to it, otherwise
+ it is returned as a string.
"""
return format(lex(code, lexer), formatter, outfile)
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/__main__.py b/venv1/Lib/site-packages/pip/_vendor/pygments/__main__.py
index a2e612f5..90cafd93 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/__main__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/__main__.py
@@ -4,7 +4,7 @@
Main entry point for ``python -m pygments``.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/console.py b/venv1/Lib/site-packages/pip/_vendor/pygments/console.py
index ee1ac27a..2ada68e0 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/console.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/console.py
@@ -4,7 +4,7 @@
Format colored console output.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -27,12 +27,12 @@
"brightmagenta", "brightcyan", "white"]
x = 30
-for dark, light in zip(dark_colors, light_colors):
- codes[dark] = esc + "%im" % x
- codes[light] = esc + "%im" % (60 + x)
+for d, l in zip(dark_colors, light_colors):
+ codes[d] = esc + "%im" % x
+ codes[l] = esc + "%im" % (60 + x)
x += 1
-del dark, light, x
+del d, l, x
codes["white"] = codes["bold"]
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/filter.py b/venv1/Lib/site-packages/pip/_vendor/pygments/filter.py
index 5efff438..e5c96649 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/filter.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/filter.py
@@ -4,7 +4,7 @@
Module that implements the default filter.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -62,7 +62,8 @@ class FunctionFilter(Filter):
def __init__(self, **options):
if not hasattr(self, 'function'):
- raise TypeError(f'{self.__class__.__name__!r} used without bound function')
+ raise TypeError('%r used without bound function' %
+ self.__class__.__name__)
Filter.__init__(self, **options)
def filter(self, lexer, stream):
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/filters/__init__.py b/venv1/Lib/site-packages/pip/_vendor/pygments/filters/__init__.py
index 97380c92..c302a6c0 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/filters/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/filters/__init__.py
@@ -5,7 +5,7 @@
Module containing filter lookup functions and default
filters.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -39,7 +39,7 @@ def get_filter_by_name(filtername, **options):
if cls:
return cls(**options)
else:
- raise ClassNotFound(f'filter {filtername!r} not found')
+ raise ClassNotFound('filter %r not found' % filtername)
def get_all_filters():
@@ -79,9 +79,9 @@ def __init__(self, **options):
Filter.__init__(self, **options)
tags = get_list_opt(options, 'codetags',
['XXX', 'TODO', 'FIXME', 'BUG', 'NOTE'])
- self.tag_re = re.compile(r'\b({})\b'.format('|'.join([
+ self.tag_re = re.compile(r'\b(%s)\b' % '|'.join([
re.escape(tag) for tag in tags if tag
- ])))
+ ]))
def filter(self, lexer, stream):
regex = self.tag_re
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/formatter.py b/venv1/Lib/site-packages/pip/_vendor/pygments/formatter.py
index 0041e41a..a2349ef8 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/formatter.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/formatter.py
@@ -4,7 +4,7 @@
Base formatter class.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -26,21 +26,7 @@ class Formatter:
"""
Converts a token stream to text.
- Formatters should have attributes to help selecting them. These
- are similar to the corresponding :class:`~pygments.lexer.Lexer`
- attributes.
-
- .. autoattribute:: name
- :no-value:
-
- .. autoattribute:: aliases
- :no-value:
-
- .. autoattribute:: filenames
- :no-value:
-
- You can pass options as keyword arguments to the constructor.
- All formatters accept these basic options:
+ Options accepted:
``style``
The style to use, can be a string or a Style subclass
@@ -61,19 +47,15 @@ class Formatter:
support (default: None).
``outencoding``
Overrides ``encoding`` if given.
-
"""
- #: Full name for the formatter, in human-readable form.
+ #: Name of the formatter
name = None
- #: A list of short, unique identifiers that can be used to lookup
- #: the formatter from a list, e.g. using :func:`.get_formatter_by_name()`.
+ #: Shortcuts for the formatter
aliases = []
- #: A list of fnmatch patterns that match filenames for which this
- #: formatter can produce output. The patterns in this list should be unique
- #: among all formatters.
+ #: fn match rules
filenames = []
#: If True, this formatter outputs Unicode strings when no encoding
@@ -81,11 +63,6 @@ class Formatter:
unicodeoutput = True
def __init__(self, **options):
- """
- As with lexers, this constructor takes arbitrary optional arguments,
- and if you override it, you should first process your own options, then
- call the base class implementation.
- """
self.style = _lookup_style(options.get('style', 'default'))
self.full = get_bool_opt(options, 'full', False)
self.title = options.get('title', '')
@@ -98,32 +75,20 @@ def __init__(self, **options):
def get_style_defs(self, arg=''):
"""
- This method must return statements or declarations suitable to define
- the current style for subsequent highlighted text (e.g. CSS classes
- in the `HTMLFormatter`).
-
- The optional argument `arg` can be used to modify the generation and
- is formatter dependent (it is standardized because it can be given on
- the command line).
+ Return the style definitions for the current style as a string.
- This method is called by the ``-S`` :doc:`command-line option `,
- the `arg` is then given by the ``-a`` option.
+ ``arg`` is an additional argument whose meaning depends on the
+ formatter used. Note that ``arg`` can also be a list or tuple
+ for some formatters like the html formatter.
"""
return ''
def format(self, tokensource, outfile):
"""
- This method must format the tokens from the `tokensource` iterable and
- write the formatted version to the file object `outfile`.
-
- Formatter options can control how exactly the tokens are converted.
+ Format ``tokensource``, an iterable of ``(tokentype, tokenstring)``
+ tuples and write it into ``outfile``.
"""
if self.encoding:
# wrap the outfile in a StreamWriter
outfile = codecs.lookup(self.encoding)[3](outfile)
return self.format_unencoded(tokensource, outfile)
-
- # Allow writing Formatter[str] or Formatter[bytes]. That's equivalent to
- # Formatter. This helps when using third-party type stubs from typeshed.
- def __class_getitem__(cls, name):
- return cls
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/formatters/__init__.py b/venv1/Lib/site-packages/pip/_vendor/pygments/formatters/__init__.py
index 014f2ee8..7ecf7eee 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/formatters/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/formatters/__init__.py
@@ -4,14 +4,13 @@
Pygments formatters.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
-import re
import sys
import types
-import fnmatch
+from fnmatch import fnmatch
from os.path import basename
from pip._vendor.pygments.formatters._mapping import FORMATTERS
@@ -22,16 +21,6 @@
'get_all_formatters', 'load_formatter_from_file'] + list(FORMATTERS)
_formatter_cache = {} # classes by name
-_pattern_cache = {}
-
-
-def _fn_matches(fn, glob):
- """Return whether the supplied file name fn matches pattern filename."""
- if glob not in _pattern_cache:
- pattern = _pattern_cache[glob] = re.compile(fnmatch.translate(glob))
- return pattern.match(fn)
- return _pattern_cache[glob].match(fn)
-
def _load_formatters(module_name):
"""Load a formatter (and all others in the module too)."""
@@ -68,31 +57,29 @@ def find_formatter_class(alias):
def get_formatter_by_name(_alias, **options):
- """
- Return an instance of a :class:`.Formatter` subclass that has `alias` in its
- aliases list. The formatter is given the `options` at its instantiation.
+ """Lookup and instantiate a formatter by alias.
- Will raise :exc:`pygments.util.ClassNotFound` if no formatter with that
- alias is found.
+ Raises ClassNotFound if not found.
"""
cls = find_formatter_class(_alias)
if cls is None:
- raise ClassNotFound(f"no formatter found for name {_alias!r}")
+ raise ClassNotFound("no formatter found for name %r" % _alias)
return cls(**options)
-def load_formatter_from_file(filename, formattername="CustomFormatter", **options):
- """
- Return a `Formatter` subclass instance loaded from the provided file, relative
- to the current directory.
+def load_formatter_from_file(filename, formattername="CustomFormatter",
+ **options):
+ """Load a formatter from a file.
+
+ This method expects a file located relative to the current working
+ directory, which contains a class named CustomFormatter. By default,
+ it expects the Formatter to be named CustomFormatter; you can specify
+ your own class name as the second argument to this function.
- The file is expected to contain a Formatter class named ``formattername``
- (by default, CustomFormatter). Users should be very careful with the input, because
- this method is equivalent to running ``eval()`` on the input file. The formatter is
- given the `options` at its instantiation.
+ Users should be very careful with the input, because this method
+ is equivalent to running eval on the input file.
- :exc:`pygments.util.ClassNotFound` is raised if there are any errors loading
- the formatter.
+ Raises ClassNotFound if there are any problems importing the Formatter.
.. versionadded:: 2.2
"""
@@ -103,38 +90,36 @@ def load_formatter_from_file(filename, formattername="CustomFormatter", **option
exec(f.read(), custom_namespace)
# Retrieve the class `formattername` from that namespace
if formattername not in custom_namespace:
- raise ClassNotFound(f'no valid {formattername} class found in {filename}')
+ raise ClassNotFound('no valid %s class found in %s' %
+ (formattername, filename))
formatter_class = custom_namespace[formattername]
# And finally instantiate it with the options
return formatter_class(**options)
except OSError as err:
- raise ClassNotFound(f'cannot read {filename}: {err}')
+ raise ClassNotFound('cannot read %s: %s' % (filename, err))
except ClassNotFound:
raise
except Exception as err:
- raise ClassNotFound(f'error when loading custom formatter: {err}')
+ raise ClassNotFound('error when loading custom formatter: %s' % err)
def get_formatter_for_filename(fn, **options):
- """
- Return a :class:`.Formatter` subclass instance that has a filename pattern
- matching `fn`. The formatter is given the `options` at its instantiation.
+ """Lookup and instantiate a formatter by filename pattern.
- Will raise :exc:`pygments.util.ClassNotFound` if no formatter for that filename
- is found.
+ Raises ClassNotFound if not found.
"""
fn = basename(fn)
for modname, name, _, filenames, _ in FORMATTERS.values():
for filename in filenames:
- if _fn_matches(fn, filename):
+ if fnmatch(fn, filename):
if name not in _formatter_cache:
_load_formatters(modname)
return _formatter_cache[name](**options)
- for _name, cls in find_plugin_formatters():
+ for cls in find_plugin_formatters():
for filename in cls.filenames:
- if _fn_matches(fn, filename):
+ if fnmatch(fn, filename):
return cls(**options)
- raise ClassNotFound(f"no formatter found for file name {fn!r}")
+ raise ClassNotFound("no formatter found for file name %r" % fn)
class _automodule(types.ModuleType):
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/formatters/_mapping.py b/venv1/Lib/site-packages/pip/_vendor/pygments/formatters/_mapping.py
index 72ca8404..6e34f960 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/formatters/_mapping.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/formatters/_mapping.py
@@ -1,12 +1,12 @@
# Automatically generated by scripts/gen_mapfiles.py.
-# DO NOT EDIT BY HAND; run `tox -e mapfiles` instead.
+# DO NOT EDIT BY HAND; run `make mapfiles` instead.
FORMATTERS = {
'BBCodeFormatter': ('pygments.formatters.bbcode', 'BBCode', ('bbcode', 'bb'), (), 'Format tokens with BBcodes. These formatting codes are used by many bulletin boards, so you can highlight your sourcecode with pygments before posting it there.'),
'BmpImageFormatter': ('pygments.formatters.img', 'img_bmp', ('bmp', 'bitmap'), ('*.bmp',), 'Create a bitmap image from source code. This uses the Python Imaging Library to generate a pixmap from the source code.'),
'GifImageFormatter': ('pygments.formatters.img', 'img_gif', ('gif',), ('*.gif',), 'Create a GIF image from source code. This uses the Python Imaging Library to generate a pixmap from the source code.'),
'GroffFormatter': ('pygments.formatters.groff', 'groff', ('groff', 'troff', 'roff'), (), 'Format tokens with groff escapes to change their color and font style.'),
- 'HtmlFormatter': ('pygments.formatters.html', 'HTML', ('html',), ('*.html', '*.htm'), "Format tokens as HTML 4 ```` tags. By default, the content is enclosed in a ```` tag, itself wrapped in a ```` tag (but see the `nowrap` option). The ``
``'s CSS class can be set by the `cssclass` option."),
+ 'HtmlFormatter': ('pygments.formatters.html', 'HTML', ('html',), ('*.html', '*.htm'), "Format tokens as HTML 4 ``
`` tags within a ```` tag, wrapped in a ```` tag. The ``
``'s CSS class can be set by the `cssclass` option."),
'IRCFormatter': ('pygments.formatters.irc', 'IRC', ('irc', 'IRC'), (), 'Format tokens with IRC color sequences'),
'ImageFormatter': ('pygments.formatters.img', 'img', ('img', 'IMG', 'png'), ('*.png',), 'Create a PNG image from source code. This uses the Python Imaging Library to generate a pixmap from the source code.'),
'JpgImageFormatter': ('pygments.formatters.img', 'img_jpg', ('jpg', 'jpeg'), ('*.jpg',), 'Create a JPEG image from source code. This uses the Python Imaging Library to generate a pixmap from the source code.'),
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/lexer.py b/venv1/Lib/site-packages/pip/_vendor/pygments/lexer.py
index c05aa819..74ab9b90 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/lexer.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/lexer.py
@@ -4,7 +4,7 @@
Base lexer classes.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -50,38 +50,7 @@ class Lexer(metaclass=LexerMeta):
"""
Lexer for a specific language.
- See also :doc:`lexerdevelopment`, a high-level guide to writing
- lexers.
-
- Lexer classes have attributes used for choosing the most appropriate
- lexer based on various criteria.
-
- .. autoattribute:: name
- :no-value:
- .. autoattribute:: aliases
- :no-value:
- .. autoattribute:: filenames
- :no-value:
- .. autoattribute:: alias_filenames
- .. autoattribute:: mimetypes
- :no-value:
- .. autoattribute:: priority
-
- Lexers included in Pygments should have two additional attributes:
-
- .. autoattribute:: url
- :no-value:
- .. autoattribute:: version_added
- :no-value:
-
- Lexers included in Pygments may have additional attributes:
-
- .. autoattribute:: _example
- :no-value:
-
- You can pass options to the constructor. The basic options recognized
- by all lexers and processed by the base `Lexer` class are:
-
+ Basic options recognized:
``stripnl``
Strip leading and trailing newlines from the input (default: True).
``stripall``
@@ -105,62 +74,28 @@ class Lexer(metaclass=LexerMeta):
Overrides the ``encoding`` if given.
"""
- #: Full name of the lexer, in human-readable form
+ #: Name of the lexer
name = None
- #: A list of short, unique identifiers that can be used to look
- #: up the lexer from a list, e.g., using `get_lexer_by_name()`.
+ #: URL of the language specification/definition
+ url = None
+
+ #: Shortcuts for the lexer
aliases = []
- #: A list of `fnmatch` patterns that match filenames which contain
- #: content for this lexer. The patterns in this list should be unique among
- #: all lexers.
+ #: File name globs
filenames = []
- #: A list of `fnmatch` patterns that match filenames which may or may not
- #: contain content for this lexer. This list is used by the
- #: :func:`.guess_lexer_for_filename()` function, to determine which lexers
- #: are then included in guessing the correct one. That means that
- #: e.g. every lexer for HTML and a template language should include
- #: ``\*.html`` in this list.
+ #: Secondary file name globs
alias_filenames = []
- #: A list of MIME types for content that can be lexed with this lexer.
+ #: MIME types
mimetypes = []
#: Priority, should multiple lexers match and no content is provided
priority = 0
- #: URL of the language specification/definition. Used in the Pygments
- #: documentation. Set to an empty string to disable.
- url = None
-
- #: Version of Pygments in which the lexer was added.
- version_added = None
-
- #: Example file name. Relative to the ``tests/examplefiles`` directory.
- #: This is used by the documentation generator to show an example.
- _example = None
-
def __init__(self, **options):
- """
- This constructor takes arbitrary options as keyword arguments.
- Every subclass must first process its own options and then call
- the `Lexer` constructor, since it processes the basic
- options like `stripnl`.
-
- An example looks like this:
-
- .. sourcecode:: python
-
- def __init__(self, **options):
- self.compress = options.get('compress', '')
- Lexer.__init__(self, **options)
-
- As these options must all be specifiable as strings (due to the
- command line usage), there are various utility functions
- available to help with that, see `Utilities`_.
- """
self.options = options
self.stripnl = get_bool_opt(options, 'stripnl', True)
self.stripall = get_bool_opt(options, 'stripall', False)
@@ -174,9 +109,10 @@ def __init__(self, **options):
def __repr__(self):
if self.options:
- return f'
'
+ return '' % (self.__class__.__name__,
+ self.options)
else:
- return f''
+ return '' % self.__class__.__name__
def add_filter(self, filter_, **options):
"""
@@ -188,13 +124,10 @@ def add_filter(self, filter_, **options):
def analyse_text(text):
"""
- A static method which is called for lexer guessing.
-
- It should analyse the text and return a float in the range
- from ``0.0`` to ``1.0``. If it returns ``0.0``, the lexer
- will not be selected as the most probable one, if it returns
- ``1.0``, it will be selected immediately. This is used by
- `guess_lexer`.
+ Has to return a float between ``0`` and ``1`` that indicates
+ if a lexer wants to highlight this text. Used by ``guess_lexer``.
+ If this method returns ``0`` it won't highlight it in any case, if
+ it returns ``1`` highlighting with this lexer is guaranteed.
The `LexerMeta` metaclass automatically wraps this function so
that it works like a static method (no ``self`` or ``cls``
@@ -203,17 +136,21 @@ def analyse_text(text):
it's the same as if the return values was ``0.0``.
"""
- def _preprocess_lexer_input(self, text):
- """Apply preprocessing such as decoding the input, removing BOM and normalizing newlines."""
+ def get_tokens(self, text, unfiltered=False):
+ """
+ Return an iterable of (tokentype, value) pairs generated from
+ `text`. If `unfiltered` is set to `True`, the filtering mechanism
+ is bypassed even if filters are defined.
+ Also preprocess the text, i.e. expand tabs and strip it if
+ wanted and applies registered filters.
+ """
if not isinstance(text, str):
if self.encoding == 'guess':
text, _ = guess_decode(text)
elif self.encoding == 'chardet':
try:
- # pip vendoring note: this code is not reachable by pip,
- # removed import of chardet to make it clear.
- raise ImportError('chardet is not vendored by pip')
+ from pip._vendor import chardet
except ImportError as e:
raise ImportError('To enable chardet encoding guessing, '
'please install the chardet library '
@@ -250,24 +187,6 @@ def _preprocess_lexer_input(self, text):
if self.ensurenl and not text.endswith('\n'):
text += '\n'
- return text
-
- def get_tokens(self, text, unfiltered=False):
- """
- This method is the basic interface of a lexer. It is called by
- the `highlight()` function. It must process the text and return an
- iterable of ``(tokentype, value)`` pairs from `text`.
-
- Normally, you don't need to override this method. The default
- implementation processes the options recognized by all lexers
- (`stripnl`, `stripall` and so on), and then yields all tokens
- from `get_tokens_unprocessed()`, with the ``index`` dropped.
-
- If `unfiltered` is set to `True`, the filtering mechanism is
- bypassed even if filters are defined.
- """
- text = self._preprocess_lexer_input(text)
-
def streamer():
for _, t, v in self.get_tokens_unprocessed(text):
yield t, v
@@ -278,12 +197,11 @@ def streamer():
def get_tokens_unprocessed(self, text):
"""
- This method should process the text and return an iterable of
- ``(index, tokentype, value)`` tuples where ``index`` is the starting
- position of the token within the input text.
+ Return an iterable of (index, tokentype, value) pairs where "index"
+ is the starting position of the token within the input text.
- It must be overridden by subclasses. It is recommended to
- implement it as a generator to maximize effectiveness.
+ In subclasses, implement this method as a generator to
+ maximize effectiveness.
"""
raise NotImplementedError
@@ -512,7 +430,7 @@ def _process_regex(cls, regex, rflags, state):
def _process_token(cls, token):
"""Preprocess the token component of a token definition."""
assert type(token) is _TokenType or callable(token), \
- f'token type must be simple type or callable, not {token!r}'
+ 'token type must be simple type or callable, not %r' % (token,)
return token
def _process_new_state(cls, new_state, unprocessed, processed):
@@ -528,14 +446,14 @@ def _process_new_state(cls, new_state, unprocessed, processed):
elif new_state[:5] == '#pop:':
return -int(new_state[5:])
else:
- assert False, f'unknown new state {new_state!r}'
+ assert False, 'unknown new state %r' % new_state
elif isinstance(new_state, combined):
# combine a new state from existing ones
tmp_state = '_tmp_%d' % cls._tmpname
cls._tmpname += 1
itokens = []
for istate in new_state:
- assert istate != new_state, f'circular state ref {istate!r}'
+ assert istate != new_state, 'circular state ref %r' % istate
itokens.extend(cls._process_state(unprocessed,
processed, istate))
processed[tmp_state] = itokens
@@ -548,12 +466,12 @@ def _process_new_state(cls, new_state, unprocessed, processed):
'unknown new state ' + istate
return new_state
else:
- assert False, f'unknown new state def {new_state!r}'
+ assert False, 'unknown new state def %r' % new_state
def _process_state(cls, unprocessed, processed, state):
"""Preprocess a single state definition."""
- assert isinstance(state, str), f"wrong state name {state!r}"
- assert state[0] != '#', f"invalid state name {state!r}"
+ assert type(state) is str, "wrong state name %r" % state
+ assert state[0] != '#', "invalid state name %r" % state
if state in processed:
return processed[state]
tokens = processed[state] = []
@@ -561,7 +479,7 @@ def _process_state(cls, unprocessed, processed, state):
for tdef in unprocessed[state]:
if isinstance(tdef, include):
# it's a state reference
- assert tdef != state, f"circular state reference {state!r}"
+ assert tdef != state, "circular state reference %r" % state
tokens.extend(cls._process_state(unprocessed, processed,
str(tdef)))
continue
@@ -575,12 +493,13 @@ def _process_state(cls, unprocessed, processed, state):
tokens.append((re.compile('').match, None, new_state))
continue
- assert type(tdef) is tuple, f"wrong rule def {tdef!r}"
+ assert type(tdef) is tuple, "wrong rule def %r" % tdef
try:
rex = cls._process_regex(tdef[0], rflags, state)
except Exception as err:
- raise ValueError(f"uncompilable regex {tdef[0]!r} in state {state!r} of {cls!r}: {err}") from err
+ raise ValueError("uncompilable regex %r in state %r of %r: %s" %
+ (tdef[0], state, cls, err)) from err
token = cls._process_token(tdef[1])
@@ -741,7 +660,7 @@ def get_tokens_unprocessed(self, text, stack=('root',)):
elif new_state == '#push':
statestack.append(statestack[-1])
else:
- assert False, f"wrong state def: {new_state!r}"
+ assert False, "wrong state def: %r" % new_state
statetokens = tokendefs[statestack[-1]]
break
else:
@@ -773,7 +692,8 @@ def __init__(self, text, pos, stack=None, end=None):
self.stack = stack or ['root']
def __repr__(self):
- return f'LexerContext({self.text!r}, {self.pos!r}, {self.stack!r})'
+ return 'LexerContext(%r, %r, %r)' % (
+ self.text, self.pos, self.stack)
class ExtendedRegexLexer(RegexLexer):
@@ -828,7 +748,7 @@ def get_tokens_unprocessed(self, text=None, context=None):
elif new_state == '#push':
ctx.stack.append(ctx.stack[-1])
else:
- assert False, f"wrong state def: {new_state!r}"
+ assert False, "wrong state def: %r" % new_state
statetokens = tokendefs[ctx.stack[-1]]
break
else:
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/__init__.py b/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/__init__.py
index 49184ec8..e75a0579 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/__init__.py
@@ -4,14 +4,13 @@
Pygments lexers.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
-import re
import sys
import types
-import fnmatch
+from fnmatch import fnmatch
from os.path import basename
from pip._vendor.pygments.lexers._mapping import LEXERS
@@ -22,23 +21,12 @@
COMPAT = {
'Python3Lexer': 'PythonLexer',
'Python3TracebackLexer': 'PythonTracebackLexer',
- 'LeanLexer': 'Lean3Lexer',
}
__all__ = ['get_lexer_by_name', 'get_lexer_for_filename', 'find_lexer_class',
'guess_lexer', 'load_lexer_from_file'] + list(LEXERS) + list(COMPAT)
_lexer_cache = {}
-_pattern_cache = {}
-
-
-def _fn_matches(fn, glob):
- """Return whether the supplied file name fn matches pattern filename."""
- if glob not in _pattern_cache:
- pattern = _pattern_cache[glob] = re.compile(fnmatch.translate(glob))
- return pattern.match(fn)
- return _pattern_cache[glob].match(fn)
-
def _load_lexers(module_name):
"""Load a lexer (and all others in the module too)."""
@@ -63,9 +51,9 @@ def get_all_lexers(plugins=True):
def find_lexer_class(name):
- """
- Return the `Lexer` subclass that with the *name* attribute as given by
- the *name* argument.
+ """Lookup a lexer class by name.
+
+ Return None if not found.
"""
if name in _lexer_cache:
return _lexer_cache[name]
@@ -81,19 +69,14 @@ def find_lexer_class(name):
def find_lexer_class_by_name(_alias):
- """
- Return the `Lexer` subclass that has `alias` in its aliases list, without
- instantiating it.
+ """Lookup a lexer class by alias.
Like `get_lexer_by_name`, but does not instantiate the class.
- Will raise :exc:`pygments.util.ClassNotFound` if no lexer with that alias is
- found.
-
.. versionadded:: 2.2
"""
if not _alias:
- raise ClassNotFound(f'no lexer for alias {_alias!r} found')
+ raise ClassNotFound('no lexer for alias %r found' % _alias)
# lookup builtin lexers
for module_name, name, aliases, _, _ in LEXERS.values():
if _alias.lower() in aliases:
@@ -104,20 +87,16 @@ def find_lexer_class_by_name(_alias):
for cls in find_plugin_lexers():
if _alias.lower() in cls.aliases:
return cls
- raise ClassNotFound(f'no lexer for alias {_alias!r} found')
+ raise ClassNotFound('no lexer for alias %r found' % _alias)
def get_lexer_by_name(_alias, **options):
- """
- Return an instance of a `Lexer` subclass that has `alias` in its
- aliases list. The lexer is given the `options` at its
- instantiation.
+ """Get a lexer by an alias.
- Will raise :exc:`pygments.util.ClassNotFound` if no lexer with that alias is
- found.
+ Raises ClassNotFound if not found.
"""
if not _alias:
- raise ClassNotFound(f'no lexer for alias {_alias!r} found')
+ raise ClassNotFound('no lexer for alias %r found' % _alias)
# lookup builtin lexers
for module_name, name, aliases, _, _ in LEXERS.values():
@@ -129,7 +108,7 @@ def get_lexer_by_name(_alias, **options):
for cls in find_plugin_lexers():
if _alias.lower() in cls.aliases:
return cls(**options)
- raise ClassNotFound(f'no lexer for alias {_alias!r} found')
+ raise ClassNotFound('no lexer for alias %r found' % _alias)
def load_lexer_from_file(filename, lexername="CustomLexer", **options):
@@ -154,16 +133,17 @@ def load_lexer_from_file(filename, lexername="CustomLexer", **options):
exec(f.read(), custom_namespace)
# Retrieve the class `lexername` from that namespace
if lexername not in custom_namespace:
- raise ClassNotFound(f'no valid {lexername} class found in {filename}')
+ raise ClassNotFound('no valid %s class found in %s' %
+ (lexername, filename))
lexer_class = custom_namespace[lexername]
# And finally instantiate it with the options
return lexer_class(**options)
except OSError as err:
- raise ClassNotFound(f'cannot read {filename}: {err}')
+ raise ClassNotFound('cannot read %s: %s' % (filename, err))
except ClassNotFound:
raise
except Exception as err:
- raise ClassNotFound(f'error when loading custom lexer: {err}')
+ raise ClassNotFound('error when loading custom lexer: %s' % err)
def find_lexer_class_for_filename(_fn, code=None):
@@ -178,13 +158,13 @@ def find_lexer_class_for_filename(_fn, code=None):
fn = basename(_fn)
for modname, name, _, filenames, _ in LEXERS.values():
for filename in filenames:
- if _fn_matches(fn, filename):
+ if fnmatch(fn, filename):
if name not in _lexer_cache:
_load_lexers(modname)
matches.append((_lexer_cache[name], filename))
for cls in find_plugin_lexers():
for filename in cls.filenames:
- if _fn_matches(fn, filename):
+ if fnmatch(fn, filename):
matches.append((cls, filename))
if isinstance(code, bytes):
@@ -212,29 +192,21 @@ def get_rating(info):
def get_lexer_for_filename(_fn, code=None, **options):
"""Get a lexer for a filename.
- Return a `Lexer` subclass instance that has a filename pattern
- matching `fn`. The lexer is given the `options` at its
- instantiation.
-
- Raise :exc:`pygments.util.ClassNotFound` if no lexer for that filename
- is found.
+ If multiple lexers match the filename pattern, use ``analyse_text()`` to
+ figure out which one is more appropriate.
- If multiple lexers match the filename pattern, use their ``analyse_text()``
- methods to figure out which one is more appropriate.
+ Raises ClassNotFound if not found.
"""
res = find_lexer_class_for_filename(_fn, code)
if not res:
- raise ClassNotFound(f'no lexer for filename {_fn!r} found')
+ raise ClassNotFound('no lexer for filename %r found' % _fn)
return res(**options)
def get_lexer_for_mimetype(_mime, **options):
- """
- Return a `Lexer` subclass instance that has `mime` in its mimetype
- list. The lexer is given the `options` at its instantiation.
+ """Get a lexer for a mimetype.
- Will raise :exc:`pygments.util.ClassNotFound` if not lexer for that mimetype
- is found.
+ Raises ClassNotFound if not found.
"""
for modname, name, _, _, mimetypes in LEXERS.values():
if _mime in mimetypes:
@@ -244,7 +216,7 @@ def get_lexer_for_mimetype(_mime, **options):
for cls in find_plugin_lexers():
if _mime in cls.mimetypes:
return cls(**options)
- raise ClassNotFound(f'no lexer for mimetype {_mime!r} found')
+ raise ClassNotFound('no lexer for mimetype %r found' % _mime)
def _iter_lexerclasses(plugins=True):
@@ -260,26 +232,34 @@ def _iter_lexerclasses(plugins=True):
def guess_lexer_for_filename(_fn, _text, **options):
"""
- As :func:`guess_lexer()`, but only lexers which have a pattern in `filenames`
- or `alias_filenames` that matches `filename` are taken into consideration.
-
- :exc:`pygments.util.ClassNotFound` is raised if no lexer thinks it can
- handle the content.
+ Lookup all lexers that handle those filenames primary (``filenames``)
+ or secondary (``alias_filenames``). Then run a text analysis for those
+ lexers and choose the best result.
+
+ usage::
+
+ >>> from pygments.lexers import guess_lexer_for_filename
+ >>> guess_lexer_for_filename('hello.html', '<%= @foo %>')
+
+ >>> guess_lexer_for_filename('hello.html', '{{ title|e }}
')
+
+ >>> guess_lexer_for_filename('style.css', 'a { color: }')
+
"""
fn = basename(_fn)
primary = {}
matching_lexers = set()
for lexer in _iter_lexerclasses():
for filename in lexer.filenames:
- if _fn_matches(fn, filename):
+ if fnmatch(fn, filename):
matching_lexers.add(lexer)
primary[lexer] = True
for filename in lexer.alias_filenames:
- if _fn_matches(fn, filename):
+ if fnmatch(fn, filename):
matching_lexers.add(lexer)
primary[lexer] = False
if not matching_lexers:
- raise ClassNotFound(f'no lexer for filename {fn!r} found')
+ raise ClassNotFound('no lexer for filename %r found' % fn)
if len(matching_lexers) == 1:
return matching_lexers.pop()(**options)
result = []
@@ -302,15 +282,7 @@ def type_sort(t):
def guess_lexer(_text, **options):
- """
- Return a `Lexer` subclass instance that's guessed from the text in
- `text`. For that, the :meth:`.analyse_text()` method of every known lexer
- class is called with the text as argument, and the lexer which returned the
- highest value will be instantiated and returned.
-
- :exc:`pygments.util.ClassNotFound` is raised if no lexer thinks it can
- handle the content.
- """
+ """Guess a lexer by strong distinctions in the text (eg, shebang)."""
if not isinstance(_text, str):
inencoding = options.get('inencoding', options.get('encoding'))
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/_mapping.py b/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/_mapping.py
index c0d6a8ad..1eaaf56e 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/_mapping.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/_mapping.py
@@ -1,5 +1,5 @@
# Automatically generated by scripts/gen_mapfiles.py.
-# DO NOT EDIT BY HAND; run `tox -e mapfiles` instead.
+# DO NOT EDIT BY HAND; run `make mapfiles` instead.
LEXERS = {
'ABAPLexer': ('pip._vendor.pygments.lexers.business', 'ABAP', ('abap',), ('*.abap', '*.ABAP'), ('text/x-abap',)),
@@ -31,8 +31,7 @@
'ArduinoLexer': ('pip._vendor.pygments.lexers.c_like', 'Arduino', ('arduino',), ('*.ino',), ('text/x-arduino',)),
'ArrowLexer': ('pip._vendor.pygments.lexers.arrow', 'Arrow', ('arrow',), ('*.arw',), ()),
'ArturoLexer': ('pip._vendor.pygments.lexers.arturo', 'Arturo', ('arturo', 'art'), ('*.art',), ()),
- 'AscLexer': ('pip._vendor.pygments.lexers.asc', 'ASCII armored', ('asc', 'pem'), ('*.asc', '*.pem', 'id_dsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_ed25519', 'id_ed25519_sk', 'id_rsa'), ('application/pgp-keys', 'application/pgp-encrypted', 'application/pgp-signature', 'application/pem-certificate-chain')),
- 'Asn1Lexer': ('pip._vendor.pygments.lexers.asn1', 'ASN.1', ('asn1',), ('*.asn1',), ()),
+ 'AscLexer': ('pip._vendor.pygments.lexers.asc', 'ASCII armored', ('asc', 'pem'), ('*.asc', '*.pem', 'id_dsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_ed25519', 'id_ed25519_sk', 'id_rsa'), ('application/pgp-keys', 'application/pgp-encrypted', 'application/pgp-signature')),
'AspectJLexer': ('pip._vendor.pygments.lexers.jvm', 'AspectJ', ('aspectj',), ('*.aj',), ('text/x-aspectj',)),
'AsymptoteLexer': ('pip._vendor.pygments.lexers.graphics', 'Asymptote', ('asymptote', 'asy'), ('*.asy',), ('text/x-asymptote',)),
'AugeasLexer': ('pip._vendor.pygments.lexers.configs', 'Augeas', ('augeas',), ('*.aug',), ()),
@@ -42,11 +41,10 @@
'BBCBasicLexer': ('pip._vendor.pygments.lexers.basic', 'BBC Basic', ('bbcbasic',), ('*.bbc',), ()),
'BBCodeLexer': ('pip._vendor.pygments.lexers.markup', 'BBCode', ('bbcode',), (), ('text/x-bbcode',)),
'BCLexer': ('pip._vendor.pygments.lexers.algebra', 'BC', ('bc',), ('*.bc',), ()),
- 'BQNLexer': ('pip._vendor.pygments.lexers.bqn', 'BQN', ('bqn',), ('*.bqn',), ()),
'BSTLexer': ('pip._vendor.pygments.lexers.bibtex', 'BST', ('bst', 'bst-pybtex'), ('*.bst',), ()),
'BareLexer': ('pip._vendor.pygments.lexers.bare', 'BARE', ('bare',), ('*.bare',), ()),
'BaseMakefileLexer': ('pip._vendor.pygments.lexers.make', 'Base Makefile', ('basemake',), (), ()),
- 'BashLexer': ('pip._vendor.pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell', 'openrc'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', '.kshrc', 'kshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript', 'text/x-shellscript')),
+ 'BashLexer': ('pip._vendor.pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', '.kshrc', 'kshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript', 'text/x-shellscript')),
'BashSessionLexer': ('pip._vendor.pygments.lexers.shell', 'Bash Session', ('console', 'shell-session'), ('*.sh-session', '*.shell-session'), ('application/x-shell-session', 'application/x-sh-session')),
'BatchLexer': ('pip._vendor.pygments.lexers.shell', 'Batchfile', ('batch', 'bat', 'dosbatch', 'winbatch'), ('*.bat', '*.cmd'), ('application/x-dos-batch',)),
'BddLexer': ('pip._vendor.pygments.lexers.bdd', 'Bdd', ('bdd',), ('*.feature',), ('text/x-bdd',)),
@@ -55,7 +53,6 @@
'BibTeXLexer': ('pip._vendor.pygments.lexers.bibtex', 'BibTeX', ('bibtex', 'bib'), ('*.bib',), ('text/x-bibtex',)),
'BlitzBasicLexer': ('pip._vendor.pygments.lexers.basic', 'BlitzBasic', ('blitzbasic', 'b3d', 'bplus'), ('*.bb', '*.decls'), ('text/x-bb',)),
'BlitzMaxLexer': ('pip._vendor.pygments.lexers.basic', 'BlitzMax', ('blitzmax', 'bmax'), ('*.bmx',), ('text/x-bmx',)),
- 'BlueprintLexer': ('pip._vendor.pygments.lexers.blueprint', 'Blueprint', ('blueprint',), ('*.blp',), ('text/x-blueprint',)),
'BnfLexer': ('pip._vendor.pygments.lexers.grammar_notation', 'BNF', ('bnf',), ('*.bnf',), ('text/x-bnf',)),
'BoaLexer': ('pip._vendor.pygments.lexers.boa', 'Boa', ('boa',), ('*.boa',), ()),
'BooLexer': ('pip._vendor.pygments.lexers.dotnet', 'Boo', ('boo',), ('*.boo',), ('text/x-boo',)),
@@ -74,7 +71,6 @@
'CadlLexer': ('pip._vendor.pygments.lexers.archetype', 'cADL', ('cadl',), ('*.cadl',), ()),
'CapDLLexer': ('pip._vendor.pygments.lexers.esoteric', 'CapDL', ('capdl',), ('*.cdl',), ()),
'CapnProtoLexer': ('pip._vendor.pygments.lexers.capnproto', "Cap'n Proto", ('capnp',), ('*.capnp',), ()),
- 'CarbonLexer': ('pip._vendor.pygments.lexers.carbon', 'Carbon', ('carbon',), ('*.carbon',), ('text/x-carbon',)),
'CbmBasicV2Lexer': ('pip._vendor.pygments.lexers.basic', 'CBM BASIC V2', ('cbmbas',), ('*.bas',), ()),
'CddlLexer': ('pip._vendor.pygments.lexers.cddl', 'CDDL', ('cddl',), ('*.cddl',), ('text/x-cddl',)),
'CeylonLexer': ('pip._vendor.pygments.lexers.jvm', 'Ceylon', ('ceylon',), ('*.ceylon',), ('text/x-ceylon',)),
@@ -93,7 +89,6 @@
'ClojureScriptLexer': ('pip._vendor.pygments.lexers.jvm', 'ClojureScript', ('clojurescript', 'cljs'), ('*.cljs',), ('text/x-clojurescript', 'application/x-clojurescript')),
'CobolFreeformatLexer': ('pip._vendor.pygments.lexers.business', 'COBOLFree', ('cobolfree',), ('*.cbl', '*.CBL'), ()),
'CobolLexer': ('pip._vendor.pygments.lexers.business', 'COBOL', ('cobol',), ('*.cob', '*.COB', '*.cpy', '*.CPY'), ('text/x-cobol',)),
- 'CodeQLLexer': ('pip._vendor.pygments.lexers.codeql', 'CodeQL', ('codeql', 'ql'), ('*.ql', '*.qll'), ()),
'CoffeeScriptLexer': ('pip._vendor.pygments.lexers.javascript', 'CoffeeScript', ('coffeescript', 'coffee-script', 'coffee'), ('*.coffee',), ('text/coffeescript',)),
'ColdfusionCFCLexer': ('pip._vendor.pygments.lexers.templates', 'Coldfusion CFC', ('cfc',), ('*.cfc',), ()),
'ColdfusionHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'Coldfusion HTML', ('cfm',), ('*.cfm', '*.cfml'), ('application/x-coldfusion',)),
@@ -126,16 +121,12 @@
'DarcsPatchLexer': ('pip._vendor.pygments.lexers.diff', 'Darcs Patch', ('dpatch',), ('*.dpatch', '*.darcspatch'), ()),
'DartLexer': ('pip._vendor.pygments.lexers.javascript', 'Dart', ('dart',), ('*.dart',), ('text/x-dart',)),
'Dasm16Lexer': ('pip._vendor.pygments.lexers.asm', 'DASM16', ('dasm16',), ('*.dasm16', '*.dasm'), ('text/x-dasm16',)),
- 'DaxLexer': ('pip._vendor.pygments.lexers.dax', 'Dax', ('dax',), ('*.dax',), ()),
'DebianControlLexer': ('pip._vendor.pygments.lexers.installers', 'Debian Control file', ('debcontrol', 'control'), ('control',), ()),
- 'DebianSourcesLexer': ('pip._vendor.pygments.lexers.installers', 'Debian Sources file', ('debian.sources',), ('*.sources',), ()),
'DelphiLexer': ('pip._vendor.pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
- 'DesktopLexer': ('pip._vendor.pygments.lexers.configs', 'Desktop file', ('desktop',), ('*.desktop',), ('application/x-desktop',)),
'DevicetreeLexer': ('pip._vendor.pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
'DgLexer': ('pip._vendor.pygments.lexers.python', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
'DiffLexer': ('pip._vendor.pygments.lexers.diff', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
'DjangoLexer': ('pip._vendor.pygments.lexers.templates', 'Django/Jinja', ('django', 'jinja'), (), ('application/x-django-templating', 'application/x-jinja')),
- 'DnsZoneLexer': ('pip._vendor.pygments.lexers.dns', 'Zone', ('zone',), ('*.zone',), ('text/dns',)),
'DockerLexer': ('pip._vendor.pygments.lexers.configs', 'Docker', ('docker', 'dockerfile'), ('Dockerfile', '*.docker'), ('text/x-dockerfile-config',)),
'DtdLexer': ('pip._vendor.pygments.lexers.html', 'DTD', ('dtd',), ('*.dtd',), ('application/xml-dtd',)),
'DuelLexer': ('pip._vendor.pygments.lexers.webmisc', 'Duel', ('duel', 'jbst', 'jsonml+bst'), ('*.duel', '*.jbst'), ('text/x-duel', 'text/x-jbst')),
@@ -157,9 +148,9 @@
'ErbLexer': ('pip._vendor.pygments.lexers.templates', 'ERB', ('erb',), (), ('application/x-ruby-templating',)),
'ErlangLexer': ('pip._vendor.pygments.lexers.erlang', 'Erlang', ('erlang',), ('*.erl', '*.hrl', '*.es', '*.escript'), ('text/x-erlang',)),
'ErlangShellLexer': ('pip._vendor.pygments.lexers.erlang', 'Erlang erl session', ('erl',), ('*.erl-sh',), ('text/x-erl-shellsession',)),
- 'EvoqueHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Evoque', ('html+evoque',), (), ('text/html+evoque',)),
+ 'EvoqueHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Evoque', ('html+evoque',), ('*.html',), ('text/html+evoque',)),
'EvoqueLexer': ('pip._vendor.pygments.lexers.templates', 'Evoque', ('evoque',), ('*.evoque',), ('application/x-evoque',)),
- 'EvoqueXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Evoque', ('xml+evoque',), (), ('application/xml+evoque',)),
+ 'EvoqueXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Evoque', ('xml+evoque',), ('*.xml',), ('application/xml+evoque',)),
'ExeclineLexer': ('pip._vendor.pygments.lexers.shell', 'execline', ('execline',), ('*.exec',), ()),
'EzhilLexer': ('pip._vendor.pygments.lexers.ezhil', 'Ezhil', ('ezhil',), ('*.n',), ('text/x-ezhil',)),
'FSharpLexer': ('pip._vendor.pygments.lexers.dotnet', 'F#', ('fsharp', 'f#'), ('*.fs', '*.fsi', '*.fsx'), ('text/x-fsharp',)),
@@ -191,15 +182,12 @@
'GenshiTextLexer': ('pip._vendor.pygments.lexers.templates', 'Genshi Text', ('genshitext',), (), ('application/x-genshi-text', 'text/x-genshi')),
'GettextLexer': ('pip._vendor.pygments.lexers.textfmts', 'Gettext Catalog', ('pot', 'po'), ('*.pot', '*.po'), ('application/x-gettext', 'text/x-gettext', 'text/gettext')),
'GherkinLexer': ('pip._vendor.pygments.lexers.testing', 'Gherkin', ('gherkin', 'cucumber'), ('*.feature',), ('text/x-gherkin',)),
- 'GleamLexer': ('pip._vendor.pygments.lexers.gleam', 'Gleam', ('gleam',), ('*.gleam',), ('text/x-gleam',)),
'GnuplotLexer': ('pip._vendor.pygments.lexers.graphics', 'Gnuplot', ('gnuplot',), ('*.plot', '*.plt'), ('text/x-gnuplot',)),
'GoLexer': ('pip._vendor.pygments.lexers.go', 'Go', ('go', 'golang'), ('*.go',), ('text/x-gosrc',)),
'GoloLexer': ('pip._vendor.pygments.lexers.jvm', 'Golo', ('golo',), ('*.golo',), ()),
'GoodDataCLLexer': ('pip._vendor.pygments.lexers.business', 'GoodData-CL', ('gooddata-cl',), ('*.gdc',), ('text/x-gooddata-cl',)),
- 'GoogleSqlLexer': ('pip._vendor.pygments.lexers.sql', 'GoogleSQL', ('googlesql', 'zetasql'), ('*.googlesql', '*.googlesql.sql'), ('text/x-google-sql', 'text/x-google-sql-aux')),
'GosuLexer': ('pip._vendor.pygments.lexers.jvm', 'Gosu', ('gosu',), ('*.gs', '*.gsx', '*.gsp', '*.vark'), ('text/x-gosu',)),
'GosuTemplateLexer': ('pip._vendor.pygments.lexers.jvm', 'Gosu Template', ('gst',), ('*.gst',), ('text/x-gosu-template',)),
- 'GraphQLLexer': ('pip._vendor.pygments.lexers.graphql', 'GraphQL', ('graphql',), ('*.graphql',), ()),
'GraphvizLexer': ('pip._vendor.pygments.lexers.graphviz', 'Graphviz', ('graphviz', 'dot'), ('*.gv', '*.dot'), ('text/x-graphviz', 'text/vnd.graphviz')),
'GroffLexer': ('pip._vendor.pygments.lexers.markup', 'Groff', ('groff', 'nroff', 'man'), ('*.[1-9]', '*.man', '*.1p', '*.3pm'), ('application/x-troff', 'text/troff')),
'GroovyLexer': ('pip._vendor.pygments.lexers.jvm', 'Groovy', ('groovy',), ('*.groovy', '*.gradle'), ('text/x-groovy',)),
@@ -208,7 +196,6 @@
'HamlLexer': ('pip._vendor.pygments.lexers.html', 'Haml', ('haml',), ('*.haml',), ('text/x-haml',)),
'HandlebarsHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Handlebars', ('html+handlebars',), ('*.handlebars', '*.hbs'), ('text/html+handlebars', 'text/x-handlebars-template')),
'HandlebarsLexer': ('pip._vendor.pygments.lexers.templates', 'Handlebars', ('handlebars',), (), ()),
- 'HareLexer': ('pip._vendor.pygments.lexers.hare', 'Hare', ('hare',), ('*.ha',), ('text/x-hare',)),
'HaskellLexer': ('pip._vendor.pygments.lexers.haskell', 'Haskell', ('haskell', 'hs'), ('*.hs',), ('text/x-haskell',)),
'HaxeLexer': ('pip._vendor.pygments.lexers.haxe', 'Haxe', ('haxe', 'hxsl', 'hx'), ('*.hx', '*.hxsl'), ('text/haxe', 'text/x-haxe', 'text/x-hx')),
'HexdumpLexer': ('pip._vendor.pygments.lexers.hexdump', 'Hexdump', ('hexdump',), (), ()),
@@ -221,8 +208,8 @@
'HtmlSmartyLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Smarty', ('html+smarty',), (), ('text/html+smarty',)),
'HttpLexer': ('pip._vendor.pygments.lexers.textfmts', 'HTTP', ('http',), (), ()),
'HxmlLexer': ('pip._vendor.pygments.lexers.haxe', 'Hxml', ('haxeml', 'hxml'), ('*.hxml',), ()),
- 'HyLexer': ('pip._vendor.pygments.lexers.lisp', 'Hy', ('hylang', 'hy'), ('*.hy',), ('text/x-hy', 'application/x-hy')),
- 'HybrisLexer': ('pip._vendor.pygments.lexers.scripting', 'Hybris', ('hybris',), ('*.hyb',), ('text/x-hybris', 'application/x-hybris')),
+ 'HyLexer': ('pip._vendor.pygments.lexers.lisp', 'Hy', ('hylang',), ('*.hy',), ('text/x-hy', 'application/x-hy')),
+ 'HybrisLexer': ('pip._vendor.pygments.lexers.scripting', 'Hybris', ('hybris', 'hy'), ('*.hy', '*.hyb'), ('text/x-hybris', 'application/x-hybris')),
'IDLLexer': ('pip._vendor.pygments.lexers.idl', 'IDL', ('idl',), ('*.pro',), ('text/idl',)),
'IconLexer': ('pip._vendor.pygments.lexers.unicon', 'Icon', ('icon',), ('*.icon', '*.ICON'), ()),
'IdrisLexer': ('pip._vendor.pygments.lexers.haskell', 'Idris', ('idris', 'idr'), ('*.idr',), ('text/x-idris',)),
@@ -230,7 +217,7 @@
'Inform6Lexer': ('pip._vendor.pygments.lexers.int_fiction', 'Inform 6', ('inform6', 'i6'), ('*.inf',), ()),
'Inform6TemplateLexer': ('pip._vendor.pygments.lexers.int_fiction', 'Inform 6 template', ('i6t',), ('*.i6t',), ()),
'Inform7Lexer': ('pip._vendor.pygments.lexers.int_fiction', 'Inform 7', ('inform7', 'i7'), ('*.ni', '*.i7x'), ()),
- 'IniLexer': ('pip._vendor.pygments.lexers.configs', 'INI', ('ini', 'cfg', 'dosini'), ('*.ini', '*.cfg', '*.inf', '.editorconfig'), ('text/x-ini', 'text/inf')),
+ 'IniLexer': ('pip._vendor.pygments.lexers.configs', 'INI', ('ini', 'cfg', 'dosini'), ('*.ini', '*.cfg', '*.inf', '.editorconfig', '*.service', '*.socket', '*.device', '*.mount', '*.automount', '*.swap', '*.target', '*.path', '*.timer', '*.slice', '*.scope'), ('text/x-ini', 'text/inf')),
'IoLexer': ('pip._vendor.pygments.lexers.iolang', 'Io', ('io',), ('*.io',), ('text/x-iosrc',)),
'IokeLexer': ('pip._vendor.pygments.lexers.jvm', 'Ioke', ('ioke', 'ik'), ('*.ik',), ('text/x-iokesrc',)),
'IrcLogsLexer': ('pip._vendor.pygments.lexers.textfmts', 'IRC logs', ('irc',), ('*.weechatlog',), ('text/x-irclog',)),
@@ -239,7 +226,6 @@
'JMESPathLexer': ('pip._vendor.pygments.lexers.jmespath', 'JMESPath', ('jmespath', 'jp'), ('*.jp',), ()),
'JSLTLexer': ('pip._vendor.pygments.lexers.jslt', 'JSLT', ('jslt',), ('*.jslt',), ('text/x-jslt',)),
'JagsLexer': ('pip._vendor.pygments.lexers.modeling', 'JAGS', ('jags',), ('*.jag', '*.bug'), ()),
- 'JanetLexer': ('pip._vendor.pygments.lexers.lisp', 'Janet', ('janet',), ('*.janet', '*.jdn'), ('text/x-janet', 'application/x-janet')),
'JasminLexer': ('pip._vendor.pygments.lexers.jvm', 'Jasmin', ('jasmin', 'jasminxt'), ('*.j',), ()),
'JavaLexer': ('pip._vendor.pygments.lexers.jvm', 'Java', ('java',), ('*.java',), ('text/x-java',)),
'JavascriptDjangoLexer': ('pip._vendor.pygments.lexers.templates', 'JavaScript+Django/Jinja', ('javascript+django', 'js+django', 'javascript+jinja', 'js+jinja'), ('*.js.j2', '*.js.jinja2'), ('application/x-javascript+django', 'application/x-javascript+jinja', 'text/x-javascript+django', 'text/x-javascript+jinja', 'text/javascript+django', 'text/javascript+jinja')),
@@ -251,13 +237,11 @@
'JavascriptUL4Lexer': ('pip._vendor.pygments.lexers.ul4', 'Javascript+UL4', ('js+ul4',), ('*.jsul4',), ()),
'JclLexer': ('pip._vendor.pygments.lexers.scripting', 'JCL', ('jcl',), ('*.jcl',), ('text/x-jcl',)),
'JsgfLexer': ('pip._vendor.pygments.lexers.grammar_notation', 'JSGF', ('jsgf',), ('*.jsgf',), ('application/jsgf', 'application/x-jsgf', 'text/jsgf')),
- 'Json5Lexer': ('pip._vendor.pygments.lexers.json5', 'JSON5', ('json5',), ('*.json5',), ()),
'JsonBareObjectLexer': ('pip._vendor.pygments.lexers.data', 'JSONBareObject', (), (), ()),
'JsonLdLexer': ('pip._vendor.pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
- 'JsonLexer': ('pip._vendor.pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', '*.jsonl', '*.ndjson', 'Pipfile.lock'), ('application/json', 'application/json-object', 'application/x-ndjson', 'application/jsonl', 'application/json-seq')),
+ 'JsonLexer': ('pip._vendor.pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', 'Pipfile.lock'), ('application/json', 'application/json-object')),
'JsonnetLexer': ('pip._vendor.pygments.lexers.jsonnet', 'Jsonnet', ('jsonnet',), ('*.jsonnet', '*.libsonnet'), ()),
'JspLexer': ('pip._vendor.pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)),
- 'JsxLexer': ('pip._vendor.pygments.lexers.jsx', 'JSX', ('jsx', 'react'), ('*.jsx', '*.react'), ('text/jsx', 'text/typescript-jsx')),
'JuliaConsoleLexer': ('pip._vendor.pygments.lexers.julia', 'Julia console', ('jlcon', 'julia-repl'), (), ()),
'JuliaLexer': ('pip._vendor.pygments.lexers.julia', 'Julia', ('julia', 'jl'), ('*.jl',), ('text/x-julia', 'application/x-julia')),
'JuttleLexer': ('pip._vendor.pygments.lexers.javascript', 'Juttle', ('juttle',), ('*.juttle',), ('application/juttle', 'application/x-juttle', 'text/x-juttle', 'text/juttle')),
@@ -268,17 +252,13 @@
'KokaLexer': ('pip._vendor.pygments.lexers.haskell', 'Koka', ('koka',), ('*.kk', '*.kki'), ('text/x-koka',)),
'KotlinLexer': ('pip._vendor.pygments.lexers.jvm', 'Kotlin', ('kotlin',), ('*.kt', '*.kts'), ('text/x-kotlin',)),
'KuinLexer': ('pip._vendor.pygments.lexers.kuin', 'Kuin', ('kuin',), ('*.kn',), ()),
- 'KustoLexer': ('pip._vendor.pygments.lexers.kusto', 'Kusto', ('kql', 'kusto'), ('*.kql', '*.kusto', '.csl'), ()),
'LSLLexer': ('pip._vendor.pygments.lexers.scripting', 'LSL', ('lsl',), ('*.lsl',), ('text/x-lsl',)),
'LassoCssLexer': ('pip._vendor.pygments.lexers.templates', 'CSS+Lasso', ('css+lasso',), (), ('text/css+lasso',)),
'LassoHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Lasso', ('html+lasso',), (), ('text/html+lasso', 'application/x-httpd-lasso', 'application/x-httpd-lasso[89]')),
'LassoJavascriptLexer': ('pip._vendor.pygments.lexers.templates', 'JavaScript+Lasso', ('javascript+lasso', 'js+lasso'), (), ('application/x-javascript+lasso', 'text/x-javascript+lasso', 'text/javascript+lasso')),
'LassoLexer': ('pip._vendor.pygments.lexers.javascript', 'Lasso', ('lasso', 'lassoscript'), ('*.lasso', '*.lasso[89]'), ('text/x-lasso',)),
'LassoXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Lasso', ('xml+lasso',), (), ('application/xml+lasso',)),
- 'LdaprcLexer': ('pip._vendor.pygments.lexers.ldap', 'LDAP configuration file', ('ldapconf', 'ldaprc'), ('.ldaprc', 'ldaprc', 'ldap.conf'), ('text/x-ldapconf',)),
- 'LdifLexer': ('pip._vendor.pygments.lexers.ldap', 'LDIF', ('ldif',), ('*.ldif',), ('text/x-ldif',)),
- 'Lean3Lexer': ('pip._vendor.pygments.lexers.lean', 'Lean', ('lean', 'lean3'), ('*.lean',), ('text/x-lean', 'text/x-lean3')),
- 'Lean4Lexer': ('pip._vendor.pygments.lexers.lean', 'Lean4', ('lean4',), ('*.lean',), ('text/x-lean4',)),
+ 'LeanLexer': ('pip._vendor.pygments.lexers.theorem', 'Lean', ('lean',), ('*.lean',), ('text/x-lean',)),
'LessCssLexer': ('pip._vendor.pygments.lexers.css', 'LessCss', ('less',), ('*.less',), ('text/x-less-css',)),
'LighttpdConfLexer': ('pip._vendor.pygments.lexers.configs', 'Lighttpd configuration file', ('lighttpd', 'lighty'), ('lighttpd.conf',), ('text/x-lighttpd-conf',)),
'LilyPondLexer': ('pip._vendor.pygments.lexers.lilypond', 'LilyPond', ('lilypond',), ('*.ly',), ()),
@@ -295,7 +275,6 @@
'LogosLexer': ('pip._vendor.pygments.lexers.objective', 'Logos', ('logos',), ('*.x', '*.xi', '*.xm', '*.xmi'), ('text/x-logos',)),
'LogtalkLexer': ('pip._vendor.pygments.lexers.prolog', 'Logtalk', ('logtalk',), ('*.lgt', '*.logtalk'), ('text/x-logtalk',)),
'LuaLexer': ('pip._vendor.pygments.lexers.scripting', 'Lua', ('lua',), ('*.lua', '*.wlua'), ('text/x-lua', 'application/x-lua')),
- 'LuauLexer': ('pip._vendor.pygments.lexers.scripting', 'Luau', ('luau',), ('*.luau',), ()),
'MCFunctionLexer': ('pip._vendor.pygments.lexers.minecraft', 'MCFunction', ('mcfunction', 'mcf'), ('*.mcfunction',), ('text/mcfunction',)),
'MCSchemaLexer': ('pip._vendor.pygments.lexers.minecraft', 'MCSchema', ('mcschema',), ('*.mcschema',), ('text/mcschema',)),
'MIMELexer': ('pip._vendor.pygments.lexers.mime', 'MIME', ('mime',), (), ('multipart/mixed', 'multipart/related', 'multipart/alternative')),
@@ -309,7 +288,6 @@
'MakoJavascriptLexer': ('pip._vendor.pygments.lexers.templates', 'JavaScript+Mako', ('javascript+mako', 'js+mako'), (), ('application/x-javascript+mako', 'text/x-javascript+mako', 'text/javascript+mako')),
'MakoLexer': ('pip._vendor.pygments.lexers.templates', 'Mako', ('mako',), ('*.mao',), ('application/x-mako',)),
'MakoXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Mako', ('xml+mako',), (), ('application/xml+mako',)),
- 'MapleLexer': ('pip._vendor.pygments.lexers.maple', 'Maple', ('maple',), ('*.mpl', '*.mi', '*.mm'), ('text/x-maple',)),
'MaqlLexer': ('pip._vendor.pygments.lexers.business', 'MAQL', ('maql',), ('*.maql',), ('text/x-gooddata-maql', 'application/x-gooddata-maql')),
'MarkdownLexer': ('pip._vendor.pygments.lexers.markup', 'Markdown', ('markdown', 'md'), ('*.md', '*.markdown'), ('text/x-markdown',)),
'MaskLexer': ('pip._vendor.pygments.lexers.javascript', 'Mask', ('mask',), ('*.mask',), ('text/x-mask',)),
@@ -324,7 +302,6 @@
'ModelicaLexer': ('pip._vendor.pygments.lexers.modeling', 'Modelica', ('modelica',), ('*.mo',), ('text/x-modelica',)),
'Modula2Lexer': ('pip._vendor.pygments.lexers.modula2', 'Modula-2', ('modula2', 'm2'), ('*.def', '*.mod'), ('text/x-modula2',)),
'MoinWikiLexer': ('pip._vendor.pygments.lexers.markup', 'MoinMoin/Trac Wiki markup', ('trac-wiki', 'moin'), (), ('text/x-trac-wiki',)),
- 'MojoLexer': ('pip._vendor.pygments.lexers.mojo', 'Mojo', ('mojo', '🔥'), ('*.mojo', '*.🔥'), ('text/x-mojo', 'application/x-mojo')),
'MonkeyLexer': ('pip._vendor.pygments.lexers.basic', 'Monkey', ('monkey',), ('*.monkey',), ('text/x-monkey',)),
'MonteLexer': ('pip._vendor.pygments.lexers.monte', 'Monte', ('monte',), ('*.mt',), ()),
'MoonScriptLexer': ('pip._vendor.pygments.lexers.scripting', 'MoonScript', ('moonscript', 'moon'), ('*.moon',), ('text/x-moonscript', 'application/x-moonscript')),
@@ -361,7 +338,6 @@
'NotmuchLexer': ('pip._vendor.pygments.lexers.textfmts', 'Notmuch', ('notmuch',), (), ()),
'NuSMVLexer': ('pip._vendor.pygments.lexers.smv', 'NuSMV', ('nusmv',), ('*.smv',), ()),
'NumPyLexer': ('pip._vendor.pygments.lexers.python', 'NumPy', ('numpy',), (), ()),
- 'NumbaIRLexer': ('pip._vendor.pygments.lexers.numbair', 'Numba_IR', ('numba_ir', 'numbair'), ('*.numba_ir',), ('text/x-numba_ir', 'text/x-numbair')),
'ObjdumpLexer': ('pip._vendor.pygments.lexers.asm', 'objdump', ('objdump',), ('*.objdump',), ('text/x-objdump',)),
'ObjectiveCLexer': ('pip._vendor.pygments.lexers.objective', 'Objective-C', ('objective-c', 'objectivec', 'obj-c', 'objc'), ('*.m', '*.h'), ('text/x-objective-c',)),
'ObjectiveCppLexer': ('pip._vendor.pygments.lexers.objective', 'Objective-C++', ('objective-c++', 'objectivec++', 'obj-c++', 'objc++'), ('*.mm', '*.hh'), ('text/x-objective-c++',)),
@@ -373,14 +349,11 @@
'OocLexer': ('pip._vendor.pygments.lexers.ooc', 'Ooc', ('ooc',), ('*.ooc',), ('text/x-ooc',)),
'OpaLexer': ('pip._vendor.pygments.lexers.ml', 'Opa', ('opa',), ('*.opa',), ('text/x-opa',)),
'OpenEdgeLexer': ('pip._vendor.pygments.lexers.business', 'OpenEdge ABL', ('openedge', 'abl', 'progress'), ('*.p', '*.cls'), ('text/x-openedge', 'application/x-openedge')),
- 'OpenScadLexer': ('pip._vendor.pygments.lexers.openscad', 'OpenSCAD', ('openscad',), ('*.scad',), ('application/x-openscad',)),
- 'OrgLexer': ('pip._vendor.pygments.lexers.markup', 'Org Mode', ('org', 'orgmode', 'org-mode'), ('*.org',), ('text/org',)),
'OutputLexer': ('pip._vendor.pygments.lexers.special', 'Text output', ('output',), (), ()),
'PacmanConfLexer': ('pip._vendor.pygments.lexers.configs', 'PacmanConf', ('pacmanconf',), ('pacman.conf',), ()),
'PanLexer': ('pip._vendor.pygments.lexers.dsls', 'Pan', ('pan',), ('*.pan',), ()),
'ParaSailLexer': ('pip._vendor.pygments.lexers.parasail', 'ParaSail', ('parasail',), ('*.psi', '*.psl'), ('text/x-parasail',)),
'PawnLexer': ('pip._vendor.pygments.lexers.pawn', 'Pawn', ('pawn',), ('*.p', '*.pwn', '*.inc'), ('text/x-pawn',)),
- 'PddlLexer': ('pip._vendor.pygments.lexers.pddl', 'PDDL', ('pddl',), ('*.pddl',), ()),
'PegLexer': ('pip._vendor.pygments.lexers.grammar_notation', 'PEG', ('peg',), ('*.peg',), ('text/x-peg',)),
'Perl6Lexer': ('pip._vendor.pygments.lexers.perl', 'Perl6', ('perl6', 'pl6', 'raku'), ('*.pl', '*.pm', '*.nqp', '*.p6', '*.6pl', '*.p6l', '*.pl6', '*.6pm', '*.p6m', '*.pm6', '*.t', '*.raku', '*.rakumod', '*.rakutest', '*.rakudoc'), ('text/x-perl6', 'application/x-perl6')),
'PerlLexer': ('pip._vendor.pygments.lexers.perl', 'Perl', ('perl', 'pl'), ('*.pl', '*.pm', '*.t', '*.perl'), ('text/x-perl', 'application/x-perl')),
@@ -395,7 +368,6 @@
'PortugolLexer': ('pip._vendor.pygments.lexers.pascal', 'Portugol', ('portugol',), ('*.alg', '*.portugol'), ()),
'PostScriptLexer': ('pip._vendor.pygments.lexers.graphics', 'PostScript', ('postscript', 'postscr'), ('*.ps', '*.eps'), ('application/postscript',)),
'PostgresConsoleLexer': ('pip._vendor.pygments.lexers.sql', 'PostgreSQL console (psql)', ('psql', 'postgresql-console', 'postgres-console'), (), ('text/x-postgresql-psql',)),
- 'PostgresExplainLexer': ('pip._vendor.pygments.lexers.sql', 'PostgreSQL EXPLAIN dialect', ('postgres-explain',), ('*.explain',), ('text/x-postgresql-explain',)),
'PostgresLexer': ('pip._vendor.pygments.lexers.sql', 'PostgreSQL SQL dialect', ('postgresql', 'postgres'), (), ('text/x-postgresql',)),
'PovrayLexer': ('pip._vendor.pygments.lexers.graphics', 'POVRay', ('pov',), ('*.pov', '*.inc'), ('text/x-povray',)),
'PowerShellLexer': ('pip._vendor.pygments.lexers.shell', 'PowerShell', ('powershell', 'pwsh', 'posh', 'ps1', 'psm1'), ('*.ps1', '*.psm1'), ('text/x-powershell',)),
@@ -404,19 +376,16 @@
'ProcfileLexer': ('pip._vendor.pygments.lexers.procfile', 'Procfile', ('procfile',), ('Procfile',), ()),
'PrologLexer': ('pip._vendor.pygments.lexers.prolog', 'Prolog', ('prolog',), ('*.ecl', '*.prolog', '*.pro', '*.pl'), ('text/x-prolog',)),
'PromQLLexer': ('pip._vendor.pygments.lexers.promql', 'PromQL', ('promql',), ('*.promql',), ()),
- 'PromelaLexer': ('pip._vendor.pygments.lexers.c_like', 'Promela', ('promela',), ('*.pml', '*.prom', '*.prm', '*.promela', '*.pr', '*.pm'), ('text/x-promela',)),
'PropertiesLexer': ('pip._vendor.pygments.lexers.configs', 'Properties', ('properties', 'jproperties'), ('*.properties',), ('text/x-java-properties',)),
'ProtoBufLexer': ('pip._vendor.pygments.lexers.dsls', 'Protocol Buffer', ('protobuf', 'proto'), ('*.proto',), ()),
- 'PrqlLexer': ('pip._vendor.pygments.lexers.prql', 'PRQL', ('prql',), ('*.prql',), ('application/prql', 'application/x-prql')),
'PsyshConsoleLexer': ('pip._vendor.pygments.lexers.php', 'PsySH console session for PHP', ('psysh',), (), ()),
- 'PtxLexer': ('pip._vendor.pygments.lexers.ptx', 'PTX', ('ptx',), ('*.ptx',), ('text/x-ptx',)),
'PugLexer': ('pip._vendor.pygments.lexers.html', 'Pug', ('pug', 'jade'), ('*.pug', '*.jade'), ('text/x-pug', 'text/x-jade')),
'PuppetLexer': ('pip._vendor.pygments.lexers.dsls', 'Puppet', ('puppet',), ('*.pp',), ()),
'PyPyLogLexer': ('pip._vendor.pygments.lexers.console', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
'Python2Lexer': ('pip._vendor.pygments.lexers.python', 'Python 2.x', ('python2', 'py2'), (), ('text/x-python2', 'application/x-python2')),
'Python2TracebackLexer': ('pip._vendor.pygments.lexers.python', 'Python 2.x Traceback', ('py2tb',), ('*.py2tb',), ('text/x-python2-traceback',)),
- 'PythonConsoleLexer': ('pip._vendor.pygments.lexers.python', 'Python console session', ('pycon', 'python-console'), (), ('text/x-python-doctest',)),
- 'PythonLexer': ('pip._vendor.pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark', 'pyi'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
+ 'PythonConsoleLexer': ('pip._vendor.pygments.lexers.python', 'Python console session', ('pycon',), (), ('text/x-python-doctest',)),
+ 'PythonLexer': ('pip._vendor.pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
'PythonTracebackLexer': ('pip._vendor.pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
'PythonUL4Lexer': ('pip._vendor.pygments.lexers.ul4', 'Python+UL4', ('py+ul4',), ('*.pyul4',), ()),
'QBasicLexer': ('pip._vendor.pygments.lexers.basic', 'QBasic', ('qbasic', 'basic'), ('*.BAS', '*.bas'), ('text/basic',)),
@@ -443,7 +412,6 @@
'RedLexer': ('pip._vendor.pygments.lexers.rebol', 'Red', ('red', 'red/system'), ('*.red', '*.reds'), ('text/x-red', 'text/x-red-system')),
'RedcodeLexer': ('pip._vendor.pygments.lexers.esoteric', 'Redcode', ('redcode',), ('*.cw',), ()),
'RegeditLexer': ('pip._vendor.pygments.lexers.configs', 'reg', ('registry',), ('*.reg',), ('text/x-windows-registry',)),
- 'RegoLexer': ('pip._vendor.pygments.lexers.rego', 'Rego', ('rego',), ('*.rego',), ('text/x-rego',)),
'ResourceLexer': ('pip._vendor.pygments.lexers.resource', 'ResourceBundle', ('resourcebundle', 'resource'), (), ()),
'RexxLexer': ('pip._vendor.pygments.lexers.scripting', 'Rexx', ('rexx', 'arexx'), ('*.rexx', '*.rex', '*.rx', '*.arexx'), ('text/x-rexx',)),
'RhtmlLexer': ('pip._vendor.pygments.lexers.templates', 'RHTML', ('rhtml', 'html+erb', 'html+ruby'), ('*.rhtml',), ('text/html+ruby',)),
@@ -489,7 +457,6 @@
'SnobolLexer': ('pip._vendor.pygments.lexers.snobol', 'Snobol', ('snobol',), ('*.snobol',), ('text/x-snobol',)),
'SnowballLexer': ('pip._vendor.pygments.lexers.dsls', 'Snowball', ('snowball',), ('*.sbl',), ()),
'SolidityLexer': ('pip._vendor.pygments.lexers.solidity', 'Solidity', ('solidity',), ('*.sol',), ()),
- 'SoongLexer': ('pip._vendor.pygments.lexers.soong', 'Soong', ('androidbp', 'bp', 'soong'), ('Android.bp',), ()),
'SophiaLexer': ('pip._vendor.pygments.lexers.sophia', 'Sophia', ('sophia',), ('*.aes',), ()),
'SourcePawnLexer': ('pip._vendor.pygments.lexers.pawn', 'SourcePawn', ('sp',), ('*.sp',), ('text/x-sourcepawn',)),
'SourcesListLexer': ('pip._vendor.pygments.lexers.installers', 'Debian Sourcelist', ('debsources', 'sourceslist', 'sources.list'), ('sources.list',), ()),
@@ -507,12 +474,9 @@
'SwiftLexer': ('pip._vendor.pygments.lexers.objective', 'Swift', ('swift',), ('*.swift',), ('text/x-swift',)),
'SwigLexer': ('pip._vendor.pygments.lexers.c_like', 'SWIG', ('swig',), ('*.swg', '*.i'), ('text/swig',)),
'SystemVerilogLexer': ('pip._vendor.pygments.lexers.hdl', 'systemverilog', ('systemverilog', 'sv'), ('*.sv', '*.svh'), ('text/x-systemverilog',)),
- 'SystemdLexer': ('pip._vendor.pygments.lexers.configs', 'Systemd', ('systemd',), ('*.service', '*.socket', '*.device', '*.mount', '*.automount', '*.swap', '*.target', '*.path', '*.timer', '*.slice', '*.scope'), ()),
'TAPLexer': ('pip._vendor.pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
'TNTLexer': ('pip._vendor.pygments.lexers.tnt', 'Typographic Number Theory', ('tnt',), ('*.tnt',), ()),
- 'TOMLLexer': ('pip._vendor.pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ('application/toml',)),
- 'TableGenLexer': ('pip._vendor.pygments.lexers.tablegen', 'TableGen', ('tablegen', 'td'), ('*.td',), ()),
- 'TactLexer': ('pip._vendor.pygments.lexers.tact', 'Tact', ('tact',), ('*.tact',), ()),
+ 'TOMLLexer': ('pip._vendor.pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ()),
'Tads3Lexer': ('pip._vendor.pygments.lexers.int_fiction', 'TADS 3', ('tads3',), ('*.t',), ()),
'TalLexer': ('pip._vendor.pygments.lexers.tal', 'Tal', ('tal', 'uxntal'), ('*.tal',), ('text/x-uxntal',)),
'TasmLexer': ('pip._vendor.pygments.lexers.asm', 'TASM', ('tasm',), ('*.asm', '*.ASM', '*.tasm'), ('text/x-tasm',)),
@@ -524,18 +488,16 @@
'TeraTermLexer': ('pip._vendor.pygments.lexers.teraterm', 'Tera Term macro', ('teratermmacro', 'teraterm', 'ttl'), ('*.ttl',), ('text/x-teratermmacro',)),
'TermcapLexer': ('pip._vendor.pygments.lexers.configs', 'Termcap', ('termcap',), ('termcap', 'termcap.src'), ()),
'TerminfoLexer': ('pip._vendor.pygments.lexers.configs', 'Terminfo', ('terminfo',), ('terminfo', 'terminfo.src'), ()),
- 'TerraformLexer': ('pip._vendor.pygments.lexers.configs', 'Terraform', ('terraform', 'tf', 'hcl'), ('*.tf', '*.hcl'), ('application/x-tf', 'application/x-terraform')),
+ 'TerraformLexer': ('pip._vendor.pygments.lexers.configs', 'Terraform', ('terraform', 'tf'), ('*.tf',), ('application/x-tf', 'application/x-terraform')),
'TexLexer': ('pip._vendor.pygments.lexers.markup', 'TeX', ('tex', 'latex'), ('*.tex', '*.aux', '*.toc'), ('text/x-tex', 'text/x-latex')),
'TextLexer': ('pip._vendor.pygments.lexers.special', 'Text only', ('text',), ('*.txt',), ('text/plain',)),
'ThingsDBLexer': ('pip._vendor.pygments.lexers.thingsdb', 'ThingsDB', ('ti', 'thingsdb'), ('*.ti',), ()),
'ThriftLexer': ('pip._vendor.pygments.lexers.dsls', 'Thrift', ('thrift',), ('*.thrift',), ('application/x-thrift',)),
'TiddlyWiki5Lexer': ('pip._vendor.pygments.lexers.markup', 'tiddler', ('tid',), ('*.tid',), ('text/vnd.tiddlywiki',)),
'TlbLexer': ('pip._vendor.pygments.lexers.tlb', 'Tl-b', ('tlb',), ('*.tlb',), ()),
- 'TlsLexer': ('pip._vendor.pygments.lexers.tls', 'TLS Presentation Language', ('tls',), (), ()),
'TodotxtLexer': ('pip._vendor.pygments.lexers.textfmts', 'Todotxt', ('todotxt',), ('todo.txt', '*.todotxt'), ('text/x-todo',)),
'TransactSqlLexer': ('pip._vendor.pygments.lexers.sql', 'Transact-SQL', ('tsql', 't-sql'), ('*.sql',), ('text/x-tsql',)),
'TreetopLexer': ('pip._vendor.pygments.lexers.parsers', 'Treetop', ('treetop',), ('*.treetop', '*.tt'), ()),
- 'TsxLexer': ('pip._vendor.pygments.lexers.jsx', 'TSX', ('tsx',), ('*.tsx',), ('text/typescript-tsx',)),
'TurtleLexer': ('pip._vendor.pygments.lexers.rdf', 'Turtle', ('turtle',), ('*.ttl',), ('text/turtle', 'application/x-turtle')),
'TwigHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Twig', ('html+twig',), ('*.twig',), ('text/html+twig',)),
'TwigLexer': ('pip._vendor.pygments.lexers.templates', 'Twig', ('twig',), (), ('application/x-twig',)),
@@ -543,13 +505,11 @@
'TypoScriptCssDataLexer': ('pip._vendor.pygments.lexers.typoscript', 'TypoScriptCssData', ('typoscriptcssdata',), (), ()),
'TypoScriptHtmlDataLexer': ('pip._vendor.pygments.lexers.typoscript', 'TypoScriptHtmlData', ('typoscripthtmldata',), (), ()),
'TypoScriptLexer': ('pip._vendor.pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.typoscript',), ('text/x-typoscript',)),
- 'TypstLexer': ('pip._vendor.pygments.lexers.typst', 'Typst', ('typst',), ('*.typ',), ('text/x-typst',)),
'UL4Lexer': ('pip._vendor.pygments.lexers.ul4', 'UL4', ('ul4',), ('*.ul4',), ()),
'UcodeLexer': ('pip._vendor.pygments.lexers.unicon', 'ucode', ('ucode',), ('*.u', '*.u1', '*.u2'), ()),
'UniconLexer': ('pip._vendor.pygments.lexers.unicon', 'Unicon', ('unicon',), ('*.icn',), ('text/unicon',)),
'UnixConfigLexer': ('pip._vendor.pygments.lexers.configs', 'Unix/Linux config files', ('unixconfig', 'linuxconfig'), (), ()),
'UrbiscriptLexer': ('pip._vendor.pygments.lexers.urbi', 'UrbiScript', ('urbiscript',), ('*.u',), ('application/x-urbiscript',)),
- 'UrlEncodedLexer': ('pip._vendor.pygments.lexers.html', 'urlencoded', ('urlencoded',), (), ('application/x-www-form-urlencoded',)),
'UsdLexer': ('pip._vendor.pygments.lexers.usd', 'USD', ('usd', 'usda'), ('*.usd', '*.usda'), ()),
'VBScriptLexer': ('pip._vendor.pygments.lexers.basic', 'VBScript', ('vbscript',), ('*.vbs', '*.VBS'), ()),
'VCLLexer': ('pip._vendor.pygments.lexers.varnish', 'VCL', ('vcl',), ('*.vcl',), ('text/x-vclsrc',)),
@@ -558,24 +518,17 @@
'VGLLexer': ('pip._vendor.pygments.lexers.dsls', 'VGL', ('vgl',), ('*.rpf',), ()),
'ValaLexer': ('pip._vendor.pygments.lexers.c_like', 'Vala', ('vala', 'vapi'), ('*.vala', '*.vapi'), ('text/x-vala',)),
'VbNetAspxLexer': ('pip._vendor.pygments.lexers.dotnet', 'aspx-vb', ('aspx-vb',), ('*.aspx', '*.asax', '*.ascx', '*.ashx', '*.asmx', '*.axd'), ()),
- 'VbNetLexer': ('pip._vendor.pygments.lexers.dotnet', 'VB.net', ('vb.net', 'vbnet', 'lobas', 'oobas', 'sobas', 'visual-basic', 'visualbasic'), ('*.vb', '*.bas'), ('text/x-vbnet', 'text/x-vba')),
+ 'VbNetLexer': ('pip._vendor.pygments.lexers.dotnet', 'VB.net', ('vb.net', 'vbnet', 'lobas', 'oobas', 'sobas'), ('*.vb', '*.bas'), ('text/x-vbnet', 'text/x-vba')),
'VelocityHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Velocity', ('html+velocity',), (), ('text/html+velocity',)),
'VelocityLexer': ('pip._vendor.pygments.lexers.templates', 'Velocity', ('velocity',), ('*.vm', '*.fhtml'), ()),
'VelocityXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Velocity', ('xml+velocity',), (), ('application/xml+velocity',)),
- 'VerifpalLexer': ('pip._vendor.pygments.lexers.verifpal', 'Verifpal', ('verifpal',), ('*.vp',), ('text/x-verifpal',)),
'VerilogLexer': ('pip._vendor.pygments.lexers.hdl', 'verilog', ('verilog', 'v'), ('*.v',), ('text/x-verilog',)),
'VhdlLexer': ('pip._vendor.pygments.lexers.hdl', 'vhdl', ('vhdl',), ('*.vhdl', '*.vhd'), ('text/x-vhdl',)),
'VimLexer': ('pip._vendor.pygments.lexers.textedit', 'VimL', ('vim',), ('*.vim', '.vimrc', '.exrc', '.gvimrc', '_vimrc', '_exrc', '_gvimrc', 'vimrc', 'gvimrc'), ('text/x-vim',)),
- 'VisualPrologGrammarLexer': ('pip._vendor.pygments.lexers.vip', 'Visual Prolog Grammar', ('visualprologgrammar',), ('*.vipgrm',), ()),
- 'VisualPrologLexer': ('pip._vendor.pygments.lexers.vip', 'Visual Prolog', ('visualprolog',), ('*.pro', '*.cl', '*.i', '*.pack', '*.ph'), ()),
- 'VueLexer': ('pip._vendor.pygments.lexers.html', 'Vue', ('vue',), ('*.vue',), ()),
- 'VyperLexer': ('pip._vendor.pygments.lexers.vyper', 'Vyper', ('vyper',), ('*.vy',), ()),
'WDiffLexer': ('pip._vendor.pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
'WatLexer': ('pip._vendor.pygments.lexers.webassembly', 'WebAssembly', ('wast', 'wat'), ('*.wat', '*.wast'), ()),
'WebIDLLexer': ('pip._vendor.pygments.lexers.webidl', 'Web IDL', ('webidl',), ('*.webidl',), ()),
- 'WgslLexer': ('pip._vendor.pygments.lexers.wgsl', 'WebGPU Shading Language', ('wgsl',), ('*.wgsl',), ('text/wgsl',)),
'WhileyLexer': ('pip._vendor.pygments.lexers.whiley', 'Whiley', ('whiley',), ('*.whiley',), ('text/x-whiley',)),
- 'WikitextLexer': ('pip._vendor.pygments.lexers.markup', 'Wikitext', ('wikitext', 'mediawiki'), (), ('text/x-wiki',)),
'WoWTocLexer': ('pip._vendor.pygments.lexers.wowtoc', 'World of Warcraft TOC', ('wowtoc',), ('*.toc',), ()),
'WrenLexer': ('pip._vendor.pygments.lexers.wren', 'Wren', ('wren',), ('*.wren',), ()),
'X10Lexer': ('pip._vendor.pygments.lexers.x10', 'X10', ('x10', 'xten'), ('*.x10',), ('text/x-x10',)),
@@ -587,14 +540,12 @@
'XmlPhpLexer': ('pip._vendor.pygments.lexers.templates', 'XML+PHP', ('xml+php',), (), ('application/xml+php',)),
'XmlSmartyLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Smarty', ('xml+smarty',), (), ('application/xml+smarty',)),
'XorgLexer': ('pip._vendor.pygments.lexers.xorg', 'Xorg', ('xorg.conf',), ('xorg.conf',), ()),
- 'XppLexer': ('pip._vendor.pygments.lexers.dotnet', 'X++', ('xpp', 'x++'), ('*.xpp',), ()),
'XsltLexer': ('pip._vendor.pygments.lexers.html', 'XSLT', ('xslt',), ('*.xsl', '*.xslt', '*.xpl'), ('application/xsl+xml', 'application/xslt+xml')),
'XtendLexer': ('pip._vendor.pygments.lexers.jvm', 'Xtend', ('xtend',), ('*.xtend',), ('text/x-xtend',)),
'XtlangLexer': ('pip._vendor.pygments.lexers.lisp', 'xtlang', ('extempore',), ('*.xtm',), ()),
'YamlJinjaLexer': ('pip._vendor.pygments.lexers.templates', 'YAML+Jinja', ('yaml+jinja', 'salt', 'sls'), ('*.sls', '*.yaml.j2', '*.yml.j2', '*.yaml.jinja2', '*.yml.jinja2'), ('text/x-yaml+jinja', 'text/x-sls')),
'YamlLexer': ('pip._vendor.pygments.lexers.data', 'YAML', ('yaml',), ('*.yaml', '*.yml'), ('text/x-yaml',)),
'YangLexer': ('pip._vendor.pygments.lexers.yang', 'YANG', ('yang',), ('*.yang',), ('application/yang',)),
- 'YaraLexer': ('pip._vendor.pygments.lexers.yara', 'YARA', ('yara', 'yar'), ('*.yar',), ('text/x-yara',)),
'ZeekLexer': ('pip._vendor.pygments.lexers.dsls', 'Zeek', ('zeek', 'bro'), ('*.zeek', '*.bro'), ()),
'ZephirLexer': ('pip._vendor.pygments.lexers.php', 'Zephir', ('zephir',), ('*.zep',), ()),
'ZigLexer': ('pip._vendor.pygments.lexers.zig', 'Zig', ('zig',), ('*.zig',), ('text/zig',)),
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/python.py b/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/python.py
index 1b788296..3341a382 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/python.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/lexers/python.py
@@ -4,14 +4,15 @@
Lexers for Python and related languages.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
+import re
import keyword
-from pip._vendor.pygments.lexer import DelegatingLexer, RegexLexer, include, \
- bygroups, using, default, words, combined, this
+from pip._vendor.pygments.lexer import Lexer, RegexLexer, include, bygroups, using, \
+ default, words, combined, do_insertions, this, line_re
from pip._vendor.pygments.util import get_bool_opt, shebang_matches
from pip._vendor.pygments.token import Text, Comment, Operator, Keyword, Name, String, \
Number, Punctuation, Generic, Other, Error, Whitespace
@@ -26,14 +27,16 @@ class PythonLexer(RegexLexer):
"""
For Python source code (version 3.x).
+ .. versionadded:: 0.10
+
.. versionchanged:: 2.5
This is now the default ``PythonLexer``. It is still available as the
alias ``Python3Lexer``.
"""
name = 'Python'
- url = 'https://www.python.org'
- aliases = ['python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark', 'pyi']
+ url = 'http://www.python.org'
+ aliases = ['python', 'py', 'sage', 'python3', 'py3']
filenames = [
'*.py',
'*.pyw',
@@ -58,9 +61,8 @@ class PythonLexer(RegexLexer):
]
mimetypes = ['text/x-python', 'application/x-python',
'text/x-python3', 'application/x-python3']
- version_added = '0.10'
- uni_name = f"[{uni.xid_start}][{uni.xid_continue}]*"
+ uni_name = "[%s][%s]*" % (uni.xid_start, uni.xid_continue)
def innerstring_rules(ttype):
return [
@@ -109,11 +111,11 @@ def fstring_rules(ttype):
(r'\\', Text),
include('keywords'),
include('soft-keywords'),
- (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'funcname'),
- (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'classname'),
- (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
+ (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'funcname'),
+ (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'classname'),
+ (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
'fromimport'),
- (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
+ (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
'import'),
include('expr'),
],
@@ -222,8 +224,7 @@ def fstring_rules(ttype):
r'(match|case)\b' # a possible keyword
r'(?![ \t]*(?:' # not followed by...
r'[:,;=^&|@~)\]}]|(?:' + # characters and keywords that mean this isn't
- # pattern matching (but None/True/False is ok)
- r'|'.join(k for k in keyword.kwlist if k[0].islower()) + r')\b))',
+ r'|'.join(keyword.kwlist) + r')\b))', # pattern matching
bygroups(Text, Keyword), 'soft-keywords-inner'),
],
'soft-keywords-inner': [
@@ -233,16 +234,16 @@ def fstring_rules(ttype):
],
'builtins': [
(words((
- '__import__', 'abs', 'aiter', 'all', 'any', 'bin', 'bool', 'bytearray',
- 'breakpoint', 'bytes', 'callable', 'chr', 'classmethod', 'compile',
- 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval',
- 'filter', 'float', 'format', 'frozenset', 'getattr', 'globals',
- 'hasattr', 'hash', 'hex', 'id', 'input', 'int', 'isinstance',
- 'issubclass', 'iter', 'len', 'list', 'locals', 'map', 'max',
- 'memoryview', 'min', 'next', 'object', 'oct', 'open', 'ord', 'pow',
- 'print', 'property', 'range', 'repr', 'reversed', 'round', 'set',
- 'setattr', 'slice', 'sorted', 'staticmethod', 'str', 'sum', 'super',
- 'tuple', 'type', 'vars', 'zip'), prefix=r'(?>|[-~+/*%=<>&^|.]', Operator),
include('keywords'),
- (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'funcname'),
- (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'classname'),
- (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
+ (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'funcname'),
+ (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'classname'),
+ (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
'fromimport'),
- (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
+ (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
'import'),
include('builtins'),
include('magicfuncs'),
@@ -636,51 +636,14 @@ def analyse_text(text):
return shebang_matches(text, r'pythonw?2(\.\d)?')
-class _PythonConsoleLexerBase(RegexLexer):
- name = 'Python console session'
- aliases = ['pycon', 'python-console']
- mimetypes = ['text/x-python-doctest']
-
- """Auxiliary lexer for `PythonConsoleLexer`.
-
- Code tokens are output as ``Token.Other.Code``, traceback tokens as
- ``Token.Other.Traceback``.
- """
- tokens = {
- 'root': [
- (r'(>>> )(.*\n)', bygroups(Generic.Prompt, Other.Code), 'continuations'),
- # This happens, e.g., when tracebacks are embedded in documentation;
- # trailing whitespaces are often stripped in such contexts.
- (r'(>>>)(\n)', bygroups(Generic.Prompt, Whitespace)),
- (r'(\^C)?Traceback \(most recent call last\):\n', Other.Traceback, 'traceback'),
- # SyntaxError starts with this
- (r' File "[^"]+", line \d+', Other.Traceback, 'traceback'),
- (r'.*\n', Generic.Output),
- ],
- 'continuations': [
- (r'(\.\.\. )(.*\n)', bygroups(Generic.Prompt, Other.Code)),
- # See above.
- (r'(\.\.\.)(\n)', bygroups(Generic.Prompt, Whitespace)),
- default('#pop'),
- ],
- 'traceback': [
- # As soon as we see a traceback, consume everything until the next
- # >>> prompt.
- (r'(?=>>>( |$))', Text, '#pop'),
- (r'(KeyboardInterrupt)(\n)', bygroups(Name.Class, Whitespace)),
- (r'.*\n', Other.Traceback),
- ],
- }
-
-
-class PythonConsoleLexer(DelegatingLexer):
+class PythonConsoleLexer(Lexer):
"""
For Python console output or doctests, such as:
.. sourcecode:: pycon
>>> a = 'foo'
- >>> print(a)
+ >>> print a
foo
>>> 1 / 0
Traceback (most recent call last):
@@ -696,36 +659,77 @@ class PythonConsoleLexer(DelegatingLexer):
.. versionchanged:: 2.5
Now defaults to ``True``.
"""
-
name = 'Python console session'
- aliases = ['pycon', 'python-console']
+ aliases = ['pycon']
mimetypes = ['text/x-python-doctest']
- url = 'https://python.org'
- version_added = ''
def __init__(self, **options):
- python3 = get_bool_opt(options, 'python3', True)
- if python3:
- pylexer = PythonLexer
- tblexer = PythonTracebackLexer
+ self.python3 = get_bool_opt(options, 'python3', True)
+ Lexer.__init__(self, **options)
+
+ def get_tokens_unprocessed(self, text):
+ if self.python3:
+ pylexer = PythonLexer(**self.options)
+ tblexer = PythonTracebackLexer(**self.options)
else:
- pylexer = Python2Lexer
- tblexer = Python2TracebackLexer
- # We have two auxiliary lexers. Use DelegatingLexer twice with
- # different tokens. TODO: DelegatingLexer should support this
- # directly, by accepting a tuplet of auxiliary lexers and a tuple of
- # distinguishing tokens. Then we wouldn't need this intermediary
- # class.
- class _ReplaceInnerCode(DelegatingLexer):
- def __init__(self, **options):
- super().__init__(pylexer, _PythonConsoleLexerBase, Other.Code, **options)
- super().__init__(tblexer, _ReplaceInnerCode, Other.Traceback, **options)
+ pylexer = Python2Lexer(**self.options)
+ tblexer = Python2TracebackLexer(**self.options)
+
+ curcode = ''
+ insertions = []
+ curtb = ''
+ tbindex = 0
+ tb = 0
+ for match in line_re.finditer(text):
+ line = match.group()
+ if line.startswith('>>> ') or line.startswith('... '):
+ tb = 0
+ insertions.append((len(curcode),
+ [(0, Generic.Prompt, line[:4])]))
+ curcode += line[4:]
+ elif line.rstrip() == '...' and not tb:
+ # only a new >>> prompt can end an exception block
+ # otherwise an ellipsis in place of the traceback frames
+ # will be mishandled
+ insertions.append((len(curcode),
+ [(0, Generic.Prompt, '...')]))
+ curcode += line[3:]
+ else:
+ if curcode:
+ yield from do_insertions(
+ insertions, pylexer.get_tokens_unprocessed(curcode))
+ curcode = ''
+ insertions = []
+ if (line.startswith('Traceback (most recent call last):') or
+ re.match(' File "[^"]+", line \\d+\\n$', line)):
+ tb = 1
+ curtb = line
+ tbindex = match.start()
+ elif line == 'KeyboardInterrupt\n':
+ yield match.start(), Name.Class, line
+ elif tb:
+ curtb += line
+ if not (line.startswith(' ') or line.strip() == '...'):
+ tb = 0
+ for i, t, v in tblexer.get_tokens_unprocessed(curtb):
+ yield tbindex+i, t, v
+ curtb = ''
+ else:
+ yield match.start(), Generic.Output, line
+ if curcode:
+ yield from do_insertions(insertions,
+ pylexer.get_tokens_unprocessed(curcode))
+ if curtb:
+ for i, t, v in tblexer.get_tokens_unprocessed(curtb):
+ yield tbindex+i, t, v
class PythonTracebackLexer(RegexLexer):
"""
For Python 3.x tracebacks, with support for chained exceptions.
+ .. versionadded:: 1.0
+
.. versionchanged:: 2.5
This is now the default ``PythonTracebackLexer``. It is still available
as the alias ``Python3TracebackLexer``.
@@ -735,13 +739,11 @@ class PythonTracebackLexer(RegexLexer):
aliases = ['pytb', 'py3tb']
filenames = ['*.pytb', '*.py3tb']
mimetypes = ['text/x-python-traceback', 'text/x-python3-traceback']
- url = 'https://python.org'
- version_added = '1.0'
tokens = {
'root': [
(r'\n', Whitespace),
- (r'^(\^C)?Traceback \(most recent call last\):\n', Generic.Traceback, 'intb'),
+ (r'^Traceback \(most recent call last\):\n', Generic.Traceback, 'intb'),
(r'^During handling of the above exception, another '
r'exception occurred:\n\n', Generic.Traceback),
(r'^The above exception was the direct cause of the '
@@ -761,8 +763,7 @@ class PythonTracebackLexer(RegexLexer):
(r'^([^:]+)(: )(.+)(\n)',
bygroups(Generic.Error, Text, Name, Whitespace), '#pop'),
(r'^([a-zA-Z_][\w.]*)(:?\n)',
- bygroups(Generic.Error, Whitespace), '#pop'),
- default('#pop'),
+ bygroups(Generic.Error, Whitespace), '#pop')
],
'markers': [
# Either `PEP 657 `
@@ -783,6 +784,8 @@ class Python2TracebackLexer(RegexLexer):
"""
For Python tracebacks.
+ .. versionadded:: 0.7
+
.. versionchanged:: 2.5
This class has been renamed from ``PythonTracebackLexer``.
``PythonTracebackLexer`` now refers to the Python 3 variant.
@@ -792,8 +795,6 @@ class Python2TracebackLexer(RegexLexer):
aliases = ['py2tb']
filenames = ['*.py2tb']
mimetypes = ['text/x-python2-traceback']
- url = 'https://python.org'
- version_added = '0.7'
tokens = {
'root': [
@@ -830,14 +831,15 @@ class Python2TracebackLexer(RegexLexer):
class CythonLexer(RegexLexer):
"""
For Pyrex and Cython source code.
+
+ .. versionadded:: 1.1
"""
name = 'Cython'
- url = 'https://cython.org'
+ url = 'http://cython.org'
aliases = ['cython', 'pyx', 'pyrex']
filenames = ['*.pyx', '*.pxd', '*.pxi']
mimetypes = ['text/x-cython', 'application/x-cython']
- version_added = '1.1'
tokens = {
'root': [
@@ -854,16 +856,16 @@ class CythonLexer(RegexLexer):
bygroups(Punctuation, Keyword.Type, Punctuation)),
(r'!=|==|<<|>>|[-~+/*%=<>&^|.?]', Operator),
(r'(from)(\d+)(<=)(\s+)(<)(\d+)(:)',
- bygroups(Keyword, Number.Integer, Operator, Whitespace, Operator,
+ bygroups(Keyword, Number.Integer, Operator, Name, Operator,
Name, Punctuation)),
include('keywords'),
- (r'(def|property)(\s+)', bygroups(Keyword, Whitespace), 'funcname'),
- (r'(cp?def)(\s+)', bygroups(Keyword, Whitespace), 'cdef'),
+ (r'(def|property)(\s+)', bygroups(Keyword, Text), 'funcname'),
+ (r'(cp?def)(\s+)', bygroups(Keyword, Text), 'cdef'),
# (should actually start a block with only cdefs)
(r'(cdef)(:)', bygroups(Keyword, Punctuation)),
- (r'(class|struct)(\s+)', bygroups(Keyword, Whitespace), 'classname'),
- (r'(from)(\s+)', bygroups(Keyword, Whitespace), 'fromimport'),
- (r'(c?import)(\s+)', bygroups(Keyword, Whitespace), 'import'),
+ (r'(class|struct)(\s+)', bygroups(Keyword, Text), 'classname'),
+ (r'(from)(\s+)', bygroups(Keyword, Text), 'fromimport'),
+ (r'(c?import)(\s+)', bygroups(Keyword, Text), 'import'),
include('builtins'),
include('backtick'),
('(?:[rR]|[uU][rR]|[rR][uU])"""', String, 'tdqs'),
@@ -941,9 +943,9 @@ class CythonLexer(RegexLexer):
(r'(public|readonly|extern|api|inline)\b', Keyword.Reserved),
(r'(struct|enum|union|class)\b', Keyword),
(r'([a-zA-Z_]\w*)(\s*)(?=[(:#=]|$)',
- bygroups(Name.Function, Whitespace), '#pop'),
+ bygroups(Name.Function, Text), '#pop'),
(r'([a-zA-Z_]\w*)(\s*)(,)',
- bygroups(Name.Function, Whitespace, Punctuation)),
+ bygroups(Name.Function, Text, Punctuation)),
(r'from\b', Keyword, '#pop'),
(r'as\b', Keyword),
(r':', Punctuation, '#pop'),
@@ -955,13 +957,13 @@ class CythonLexer(RegexLexer):
(r'[a-zA-Z_]\w*', Name.Class, '#pop')
],
'import': [
- (r'(\s+)(as)(\s+)', bygroups(Whitespace, Keyword, Whitespace)),
+ (r'(\s+)(as)(\s+)', bygroups(Text, Keyword, Text)),
(r'[a-zA-Z_][\w.]*', Name.Namespace),
- (r'(\s*)(,)(\s*)', bygroups(Whitespace, Operator, Whitespace)),
+ (r'(\s*)(,)(\s*)', bygroups(Text, Operator, Text)),
default('#pop') # all else: go back
],
'fromimport': [
- (r'(\s+)(c?import)\b', bygroups(Whitespace, Keyword), '#pop'),
+ (r'(\s+)(c?import)\b', bygroups(Text, Keyword), '#pop'),
(r'[a-zA-Z_.][\w.]*', Name.Namespace),
# ``cdef foo from "header"``, or ``for foo from 0 < i < 10``
default('#pop'),
@@ -1011,13 +1013,13 @@ class DgLexer(RegexLexer):
Lexer for dg,
a functional and object-oriented programming language
running on the CPython 3 VM.
+
+ .. versionadded:: 1.6
"""
name = 'dg'
aliases = ['dg']
filenames = ['*.dg']
mimetypes = ['text/x-dg']
- url = 'http://pyos.github.io/dg'
- version_added = '1.6'
tokens = {
'root': [
@@ -1108,12 +1110,13 @@ class DgLexer(RegexLexer):
class NumPyLexer(PythonLexer):
"""
A Python lexer recognizing Numerical Python builtins.
+
+ .. versionadded:: 0.10
"""
name = 'NumPy'
url = 'https://numpy.org/'
aliases = ['numpy']
- version_added = '0.10'
# override the mimetypes to not inherit them from python
mimetypes = []
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/modeline.py b/venv1/Lib/site-packages/pip/_vendor/pygments/modeline.py
index c310f0ed..43630835 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/modeline.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/modeline.py
@@ -4,7 +4,7 @@
A simple modeline parser (based on pymodeline).
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -19,7 +19,7 @@
''', re.VERBOSE)
-def get_filetype_from_line(l): # noqa: E741
+def get_filetype_from_line(l):
m = modeline_re.search(l)
if m:
return m.group(1)
@@ -30,8 +30,8 @@ def get_filetype_from_buffer(buf, max_lines=5):
Scan the buffer for modelines and return filetype if one is found.
"""
lines = buf.splitlines()
- for line in lines[-1:-max_lines-1:-1]:
- ret = get_filetype_from_line(line)
+ for l in lines[-1:-max_lines-1:-1]:
+ ret = get_filetype_from_line(l)
if ret:
return ret
for i in range(max_lines, -1, -1):
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/plugin.py b/venv1/Lib/site-packages/pip/_vendor/pygments/plugin.py
index 498db423..3590bee8 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/plugin.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/plugin.py
@@ -2,7 +2,12 @@
pygments.plugin
~~~~~~~~~~~~~~~
- Pygments plugin interface.
+ Pygments plugin interface. By default, this tries to use
+ ``importlib.metadata``, which is in the Python standard
+ library since Python 3.8, or its ``importlib_metadata``
+ backport for earlier versions of Python. It falls back on
+ ``pkg_resources`` if not found. Finally, if ``pkg_resources``
+ is not found either, no plugins are loaded at all.
lexer plugins::
@@ -29,10 +34,9 @@
yourfilter = yourfilter:YourFilter
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
-from importlib.metadata import entry_points
LEXER_ENTRY_POINT = 'pygments.lexers'
FORMATTER_ENTRY_POINT = 'pygments.formatters'
@@ -41,6 +45,18 @@
def iter_entry_points(group_name):
+ try:
+ from importlib.metadata import entry_points
+ except ImportError:
+ try:
+ from importlib_metadata import entry_points
+ except ImportError:
+ try:
+ from pip._vendor.pkg_resources import iter_entry_points
+ except (ImportError, OSError):
+ return []
+ else:
+ return iter_entry_points(group_name)
groups = entry_points()
if hasattr(groups, 'select'):
# New interface in Python 3.10 and newer versions of the
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/regexopt.py b/venv1/Lib/site-packages/pip/_vendor/pygments/regexopt.py
index cc8d2c31..ae007919 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/regexopt.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/regexopt.py
@@ -5,7 +5,7 @@
An algorithm that generates optimized regexes for matching long lists of
literal strings.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/scanner.py b/venv1/Lib/site-packages/pip/_vendor/pygments/scanner.py
index 3c8c8487..d47ed482 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/scanner.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/scanner.py
@@ -11,7 +11,7 @@
Have a look at the `DelphiLexer` to get an idea of how to use
this scanner.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
import re
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/sphinxext.py b/venv1/Lib/site-packages/pip/_vendor/pygments/sphinxext.py
index 955d9584..3537ecdb 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/sphinxext.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/sphinxext.py
@@ -5,7 +5,7 @@
Sphinx extension to generate automatic documentation of lexers,
formatters and filters.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -33,8 +33,6 @@
%s
- %s
-
'''
FMTERDOC = '''
@@ -121,11 +119,11 @@ def format_link(name, url):
def write_row(*columns):
"""Format a table row"""
out = []
- for length, col in zip(column_lengths, columns):
- if col:
- out.append(col.ljust(length))
+ for l, c in zip(column_lengths, columns):
+ if c:
+ out.append(c.ljust(l))
else:
- out.append(' '*length)
+ out.append(' '*l)
return ' '.join(out)
@@ -149,10 +147,6 @@ def write_seperator():
def document_lexers(self):
from pip._vendor.pygments.lexers._mapping import LEXERS
- from pip._vendor import pygments
- import inspect
- import pathlib
-
out = []
modules = {}
moduledocstrings = {}
@@ -162,40 +156,16 @@ def document_lexers(self):
self.filenames.add(mod.__file__)
cls = getattr(mod, classname)
if not cls.__doc__:
- print(f"Warning: {classname} does not have a docstring.")
+ print("Warning: %s does not have a docstring." % classname)
docstring = cls.__doc__
if isinstance(docstring, bytes):
docstring = docstring.decode('utf8')
-
- example_file = getattr(cls, '_example', None)
- if example_file:
- p = pathlib.Path(inspect.getabsfile(pygments)).parent.parent /\
- 'tests' / 'examplefiles' / example_file
- content = p.read_text(encoding='utf-8')
- if not content:
- raise Exception(
- f"Empty example file '{example_file}' for lexer "
- f"{classname}")
-
- if data[2]:
- lexer_name = data[2][0]
- docstring += '\n\n .. admonition:: Example\n'
- docstring += f'\n .. code-block:: {lexer_name}\n\n'
- for line in content.splitlines():
- docstring += f' {line}\n'
-
- if cls.version_added:
- version_line = f'.. versionadded:: {cls.version_added}'
- else:
- version_line = ''
-
modules.setdefault(module, []).append((
classname,
', '.join(data[2]) or 'None',
', '.join(data[3]).replace('*', '\\*').replace('_', '\\') or 'None',
', '.join(data[4]) or 'None',
- docstring,
- version_line))
+ docstring))
if module not in moduledocstrings:
moddoc = mod.__doc__
if isinstance(moddoc, bytes):
@@ -204,7 +174,7 @@ def document_lexers(self):
for module, lexers in sorted(modules.items(), key=lambda x: x[0]):
if moduledocstrings[module] is None:
- raise Exception(f"Missing docstring for {module}")
+ raise Exception("Missing docstring for %s" % (module,))
heading = moduledocstrings[module].splitlines()[4].strip().rstrip('.')
out.append(MODULEDOC % (module, heading, '-'*len(heading)))
for data in lexers:
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/style.py b/venv1/Lib/site-packages/pip/_vendor/pygments/style.py
index be5f8322..84abbc20 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/style.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/style.py
@@ -4,7 +4,7 @@
Basic style object.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -76,7 +76,7 @@ def colorformat(text):
return ''
elif text.startswith('var') or text.startswith('calc'):
return text
- assert False, f"wrong color format {text!r}"
+ assert False, "wrong color format %r" % text
_styles = obj._styles = {}
@@ -190,12 +190,6 @@ class Style(metaclass=StyleMeta):
#: Style definitions for individual token types.
styles = {}
- #: user-friendly style name (used when selecting the style, so this
- # should be all-lowercase, no spaces, hyphens)
- name = 'unnamed'
-
- aliases = []
-
# Attribute for lexers defined within Pygments. If set
# to True, the style is not shown in the style gallery
# on the website. This is intended for language-specific
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/styles/__init__.py b/venv1/Lib/site-packages/pip/_vendor/pygments/styles/__init__.py
index 96d53dce..44cc0efb 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/styles/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/styles/__init__.py
@@ -4,33 +4,70 @@
Contains built-in styles.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
from pip._vendor.pygments.plugin import find_plugin_styles
from pip._vendor.pygments.util import ClassNotFound
-from pip._vendor.pygments.styles._mapping import STYLES
-#: A dictionary of built-in styles, mapping style names to
-#: ``'submodule::classname'`` strings.
-#: This list is deprecated. Use `pygments.styles.STYLES` instead
-STYLE_MAP = {v[1]: v[0].split('.')[-1] + '::' + k for k, v in STYLES.items()}
-#: Internal reverse mapping to make `get_style_by_name` more efficient
-_STYLE_NAME_TO_MODULE_MAP = {v[1]: (v[0], k) for k, v in STYLES.items()}
+#: Maps style names to 'submodule::classname'.
+STYLE_MAP = {
+ 'default': 'default::DefaultStyle',
+ 'emacs': 'emacs::EmacsStyle',
+ 'friendly': 'friendly::FriendlyStyle',
+ 'friendly_grayscale': 'friendly_grayscale::FriendlyGrayscaleStyle',
+ 'colorful': 'colorful::ColorfulStyle',
+ 'autumn': 'autumn::AutumnStyle',
+ 'murphy': 'murphy::MurphyStyle',
+ 'manni': 'manni::ManniStyle',
+ 'material': 'material::MaterialStyle',
+ 'monokai': 'monokai::MonokaiStyle',
+ 'perldoc': 'perldoc::PerldocStyle',
+ 'pastie': 'pastie::PastieStyle',
+ 'borland': 'borland::BorlandStyle',
+ 'trac': 'trac::TracStyle',
+ 'native': 'native::NativeStyle',
+ 'fruity': 'fruity::FruityStyle',
+ 'bw': 'bw::BlackWhiteStyle',
+ 'vim': 'vim::VimStyle',
+ 'vs': 'vs::VisualStudioStyle',
+ 'tango': 'tango::TangoStyle',
+ 'rrt': 'rrt::RrtStyle',
+ 'xcode': 'xcode::XcodeStyle',
+ 'igor': 'igor::IgorStyle',
+ 'paraiso-light': 'paraiso_light::ParaisoLightStyle',
+ 'paraiso-dark': 'paraiso_dark::ParaisoDarkStyle',
+ 'lovelace': 'lovelace::LovelaceStyle',
+ 'algol': 'algol::AlgolStyle',
+ 'algol_nu': 'algol_nu::Algol_NuStyle',
+ 'arduino': 'arduino::ArduinoStyle',
+ 'rainbow_dash': 'rainbow_dash::RainbowDashStyle',
+ 'abap': 'abap::AbapStyle',
+ 'solarized-dark': 'solarized::SolarizedDarkStyle',
+ 'solarized-light': 'solarized::SolarizedLightStyle',
+ 'sas': 'sas::SasStyle',
+ 'staroffice' : 'staroffice::StarofficeStyle',
+ 'stata': 'stata_light::StataLightStyle',
+ 'stata-light': 'stata_light::StataLightStyle',
+ 'stata-dark': 'stata_dark::StataDarkStyle',
+ 'inkpot': 'inkpot::InkPotStyle',
+ 'zenburn': 'zenburn::ZenburnStyle',
+ 'gruvbox-dark': 'gruvbox::GruvboxDarkStyle',
+ 'gruvbox-light': 'gruvbox::GruvboxLightStyle',
+ 'dracula': 'dracula::DraculaStyle',
+ 'one-dark': 'onedark::OneDarkStyle',
+ 'lilypond' : 'lilypond::LilyPondStyle',
+ 'nord': 'nord::NordStyle',
+ 'nord-darker': 'nord::NordDarkerStyle',
+ 'github-dark': 'gh_dark::GhDarkStyle'
+}
def get_style_by_name(name):
- """
- Return a style class by its short name. The names of the builtin styles
- are listed in :data:`pygments.styles.STYLE_MAP`.
-
- Will raise :exc:`pygments.util.ClassNotFound` if no style of that name is
- found.
- """
- if name in _STYLE_NAME_TO_MODULE_MAP:
- mod, cls = _STYLE_NAME_TO_MODULE_MAP[name]
+ if name in STYLE_MAP:
+ mod, cls = STYLE_MAP[name].split('::')
builtin = "yes"
else:
for found_name, style in find_plugin_styles():
@@ -38,24 +75,23 @@ def get_style_by_name(name):
return style
# perhaps it got dropped into our styles package
builtin = ""
- mod = 'pygments.styles.' + name
+ mod = name
cls = name.title() + "Style"
try:
- mod = __import__(mod, None, None, [cls])
+ mod = __import__('pygments.styles.' + mod, None, None, [cls])
except ImportError:
- raise ClassNotFound(f"Could not find style module {mod!r}" +
- (builtin and ", though it should be builtin")
- + ".")
+ raise ClassNotFound("Could not find style module %r" % mod +
+ (builtin and ", though it should be builtin") + ".")
try:
return getattr(mod, cls)
except AttributeError:
- raise ClassNotFound(f"Could not find style class {cls!r} in style module.")
+ raise ClassNotFound("Could not find style class %r in style module." % cls)
def get_all_styles():
- """Return a generator for all styles by name, both builtin and plugin."""
- for v in STYLES.values():
- yield v[1]
+ """Return a generator for all styles by name,
+ both builtin and plugin."""
+ yield from STYLE_MAP
for name, _ in find_plugin_styles():
yield name
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/styles/_mapping.py b/venv1/Lib/site-packages/pip/_vendor/pygments/styles/_mapping.py
deleted file mode 100644
index 49a7fae9..00000000
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/styles/_mapping.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Automatically generated by scripts/gen_mapfiles.py.
-# DO NOT EDIT BY HAND; run `tox -e mapfiles` instead.
-
-STYLES = {
- 'AbapStyle': ('pygments.styles.abap', 'abap', ()),
- 'AlgolStyle': ('pygments.styles.algol', 'algol', ()),
- 'Algol_NuStyle': ('pygments.styles.algol_nu', 'algol_nu', ()),
- 'ArduinoStyle': ('pygments.styles.arduino', 'arduino', ()),
- 'AutumnStyle': ('pygments.styles.autumn', 'autumn', ()),
- 'BlackWhiteStyle': ('pygments.styles.bw', 'bw', ()),
- 'BorlandStyle': ('pygments.styles.borland', 'borland', ()),
- 'CoffeeStyle': ('pygments.styles.coffee', 'coffee', ()),
- 'ColorfulStyle': ('pygments.styles.colorful', 'colorful', ()),
- 'DefaultStyle': ('pygments.styles.default', 'default', ()),
- 'DraculaStyle': ('pygments.styles.dracula', 'dracula', ()),
- 'EmacsStyle': ('pygments.styles.emacs', 'emacs', ()),
- 'FriendlyGrayscaleStyle': ('pygments.styles.friendly_grayscale', 'friendly_grayscale', ()),
- 'FriendlyStyle': ('pygments.styles.friendly', 'friendly', ()),
- 'FruityStyle': ('pygments.styles.fruity', 'fruity', ()),
- 'GhDarkStyle': ('pygments.styles.gh_dark', 'github-dark', ()),
- 'GruvboxDarkStyle': ('pygments.styles.gruvbox', 'gruvbox-dark', ()),
- 'GruvboxLightStyle': ('pygments.styles.gruvbox', 'gruvbox-light', ()),
- 'IgorStyle': ('pygments.styles.igor', 'igor', ()),
- 'InkPotStyle': ('pygments.styles.inkpot', 'inkpot', ()),
- 'LightbulbStyle': ('pygments.styles.lightbulb', 'lightbulb', ()),
- 'LilyPondStyle': ('pygments.styles.lilypond', 'lilypond', ()),
- 'LovelaceStyle': ('pygments.styles.lovelace', 'lovelace', ()),
- 'ManniStyle': ('pygments.styles.manni', 'manni', ()),
- 'MaterialStyle': ('pygments.styles.material', 'material', ()),
- 'MonokaiStyle': ('pygments.styles.monokai', 'monokai', ()),
- 'MurphyStyle': ('pygments.styles.murphy', 'murphy', ()),
- 'NativeStyle': ('pygments.styles.native', 'native', ()),
- 'NordDarkerStyle': ('pygments.styles.nord', 'nord-darker', ()),
- 'NordStyle': ('pygments.styles.nord', 'nord', ()),
- 'OneDarkStyle': ('pygments.styles.onedark', 'one-dark', ()),
- 'ParaisoDarkStyle': ('pygments.styles.paraiso_dark', 'paraiso-dark', ()),
- 'ParaisoLightStyle': ('pygments.styles.paraiso_light', 'paraiso-light', ()),
- 'PastieStyle': ('pygments.styles.pastie', 'pastie', ()),
- 'PerldocStyle': ('pygments.styles.perldoc', 'perldoc', ()),
- 'RainbowDashStyle': ('pygments.styles.rainbow_dash', 'rainbow_dash', ()),
- 'RrtStyle': ('pygments.styles.rrt', 'rrt', ()),
- 'SasStyle': ('pygments.styles.sas', 'sas', ()),
- 'SolarizedDarkStyle': ('pygments.styles.solarized', 'solarized-dark', ()),
- 'SolarizedLightStyle': ('pygments.styles.solarized', 'solarized-light', ()),
- 'StarofficeStyle': ('pygments.styles.staroffice', 'staroffice', ()),
- 'StataDarkStyle': ('pygments.styles.stata_dark', 'stata-dark', ()),
- 'StataLightStyle': ('pygments.styles.stata_light', 'stata-light', ()),
- 'TangoStyle': ('pygments.styles.tango', 'tango', ()),
- 'TracStyle': ('pygments.styles.trac', 'trac', ()),
- 'VimStyle': ('pygments.styles.vim', 'vim', ()),
- 'VisualStudioStyle': ('pygments.styles.vs', 'vs', ()),
- 'XcodeStyle': ('pygments.styles.xcode', 'xcode', ()),
- 'ZenburnStyle': ('pygments.styles.zenburn', 'zenburn', ()),
-}
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/token.py b/venv1/Lib/site-packages/pip/_vendor/pygments/token.py
index 2f3b97e0..e3e565ad 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/token.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/token.py
@@ -4,7 +4,7 @@
Basic token types and the standard tokens.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -209,6 +209,5 @@ def string_to_tokentype(s):
Generic.Prompt: 'gp',
Generic.Strong: 'gs',
Generic.Subheading: 'gu',
- Generic.EmphStrong: 'ges',
Generic.Traceback: 'gt',
}
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/unistring.py b/venv1/Lib/site-packages/pip/_vendor/pygments/unistring.py
index e3bd2e72..2e3c8086 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/unistring.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/unistring.py
@@ -7,7 +7,7 @@
Inspired by chartypes_create.py from the MoinMoin project.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -104,7 +104,7 @@ def _handle_runs(char_list): # pragma: no cover
if a == b:
yield a
else:
- yield f'{a}-{b}'
+ yield '%s-%s' % (a, b)
if __name__ == '__main__': # pragma: no cover
@@ -112,7 +112,7 @@ def _handle_runs(char_list): # pragma: no cover
categories = {'xid_start': [], 'xid_continue': []}
- with open(__file__, encoding='utf-8') as fp:
+ with open(__file__) as fp:
content = fp.read()
header = content[:content.find('Cc =')]
@@ -136,18 +136,18 @@ def _handle_runs(char_list): # pragma: no cover
if ('a' + c).isidentifier():
categories['xid_continue'].append(c)
- with open(__file__, 'w', encoding='utf-8') as fp:
+ with open(__file__, 'w') as fp:
fp.write(header)
for cat in sorted(categories):
val = ''.join(_handle_runs(categories[cat]))
- fp.write(f'{cat} = {val!a}\n\n')
+ fp.write('%s = %a\n\n' % (cat, val))
cats = sorted(categories)
cats.remove('xid_start')
cats.remove('xid_continue')
- fp.write(f'cats = {cats!r}\n\n')
+ fp.write('cats = %r\n\n' % cats)
- fp.write(f'# Generated from unidata {unicodedata.unidata_version}\n\n')
+ fp.write('# Generated from unidata %s\n\n' % (unicodedata.unidata_version,))
fp.write(footer)
diff --git a/venv1/Lib/site-packages/pip/_vendor/pygments/util.py b/venv1/Lib/site-packages/pip/_vendor/pygments/util.py
index 71c5710a..8032962d 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pygments/util.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pygments/util.py
@@ -4,7 +4,7 @@
Utility functions.
- :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -32,79 +32,63 @@ class ClassNotFound(ValueError):
class OptionError(Exception):
- """
- This exception will be raised by all option processing functions if
- the type or value of the argument is not correct.
- """
+ pass
+
def get_choice_opt(options, optname, allowed, default=None, normcase=False):
- """
- If the key `optname` from the dictionary is not in the sequence
- `allowed`, raise an error, otherwise return it.
- """
string = options.get(optname, default)
if normcase:
string = string.lower()
if string not in allowed:
- raise OptionError('Value for option {} must be one of {}'.format(optname, ', '.join(map(str, allowed))))
+ raise OptionError('Value for option %s must be one of %s' %
+ (optname, ', '.join(map(str, allowed))))
return string
def get_bool_opt(options, optname, default=None):
- """
- Intuitively, this is `options.get(optname, default)`, but restricted to
- Boolean value. The Booleans can be represented as string, in order to accept
- Boolean value from the command line arguments. If the key `optname` is
- present in the dictionary `options` and is not associated with a Boolean,
- raise an `OptionError`. If it is absent, `default` is returned instead.
-
- The valid string values for ``True`` are ``1``, ``yes``, ``true`` and
- ``on``, the ones for ``False`` are ``0``, ``no``, ``false`` and ``off``
- (matched case-insensitively).
- """
string = options.get(optname, default)
if isinstance(string, bool):
return string
elif isinstance(string, int):
return bool(string)
elif not isinstance(string, str):
- raise OptionError(f'Invalid type {string!r} for option {optname}; use '
- '1/0, yes/no, true/false, on/off')
+ raise OptionError('Invalid type %r for option %s; use '
+ '1/0, yes/no, true/false, on/off' % (
+ string, optname))
elif string.lower() in ('1', 'yes', 'true', 'on'):
return True
elif string.lower() in ('0', 'no', 'false', 'off'):
return False
else:
- raise OptionError(f'Invalid value {string!r} for option {optname}; use '
- '1/0, yes/no, true/false, on/off')
+ raise OptionError('Invalid value %r for option %s; use '
+ '1/0, yes/no, true/false, on/off' % (
+ string, optname))
def get_int_opt(options, optname, default=None):
- """As :func:`get_bool_opt`, but interpret the value as an integer."""
string = options.get(optname, default)
try:
return int(string)
except TypeError:
- raise OptionError(f'Invalid type {string!r} for option {optname}; you '
- 'must give an integer value')
+ raise OptionError('Invalid type %r for option %s; you '
+ 'must give an integer value' % (
+ string, optname))
except ValueError:
- raise OptionError(f'Invalid value {string!r} for option {optname}; you '
- 'must give an integer value')
+ raise OptionError('Invalid value %r for option %s; you '
+ 'must give an integer value' % (
+ string, optname))
+
def get_list_opt(options, optname, default=None):
- """
- If the key `optname` from the dictionary `options` is a string,
- split it at whitespace and return it. If it is already a list
- or a tuple, it is returned as a list.
- """
val = options.get(optname, default)
if isinstance(val, str):
return val.split()
elif isinstance(val, (list, tuple)):
return list(val)
else:
- raise OptionError(f'Invalid type {val!r} for option {optname}; you '
- 'must give a list value')
+ raise OptionError('Invalid type %r for option %s; you '
+ 'must give a list value' % (
+ val, optname))
def docstring_headline(obj):
@@ -175,7 +159,7 @@ def shebang_matches(text, regex):
if x and not x.startswith('-')][-1]
except IndexError:
return False
- regex = re.compile(rf'^{regex}(\.(exe|cmd|bat|bin))?$', re.IGNORECASE)
+ regex = re.compile(r'^%s(\.(exe|cmd|bat|bin))?$' % regex, re.IGNORECASE)
if regex.search(found) is not None:
return True
return False
diff --git a/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/__init__.py b/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/__init__.py
index 746b89f7..ddfcf7f7 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/__init__.py
@@ -1,9 +1,8 @@
"""Wrappers to call pyproject.toml-based build backend hooks.
"""
-from typing import TYPE_CHECKING
-
from ._impl import (
+ BackendInvalid,
BackendUnavailable,
BuildBackendHookCaller,
HookMissing,
@@ -12,20 +11,13 @@
quiet_subprocess_runner,
)
-__version__ = "1.2.0"
+__version__ = '1.0.0'
__all__ = [
- "BackendUnavailable",
- "BackendInvalid",
- "HookMissing",
- "UnsupportedOperation",
- "default_subprocess_runner",
- "quiet_subprocess_runner",
- "BuildBackendHookCaller",
+ 'BackendUnavailable',
+ 'BackendInvalid',
+ 'HookMissing',
+ 'UnsupportedOperation',
+ 'default_subprocess_runner',
+ 'quiet_subprocess_runner',
+ 'BuildBackendHookCaller',
]
-
-BackendInvalid = BackendUnavailable # Deprecated alias, previously a separate exception
-
-if TYPE_CHECKING:
- from ._impl import SubprocessRunner
-
- __all__ += ["SubprocessRunner"]
diff --git a/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_impl.py b/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_impl.py
index d1e9d7bb..37b0e653 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_impl.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_impl.py
@@ -6,72 +6,48 @@
from os.path import abspath
from os.path import join as pjoin
from subprocess import STDOUT, check_call, check_output
-from typing import TYPE_CHECKING, Any, Iterator, Mapping, Optional, Sequence
from ._in_process import _in_proc_script_path
-if TYPE_CHECKING:
- from typing import Protocol
- class SubprocessRunner(Protocol):
- """A protocol for the subprocess runner."""
-
- def __call__(
- self,
- cmd: Sequence[str],
- cwd: Optional[str] = None,
- extra_environ: Optional[Mapping[str, str]] = None,
- ) -> None:
- ...
-
-
-def write_json(obj: Mapping[str, Any], path: str, **kwargs) -> None:
- with open(path, "w", encoding="utf-8") as f:
+def write_json(obj, path, **kwargs):
+ with open(path, 'w', encoding='utf-8') as f:
json.dump(obj, f, **kwargs)
-def read_json(path: str) -> Mapping[str, Any]:
- with open(path, encoding="utf-8") as f:
+def read_json(path):
+ with open(path, encoding='utf-8') as f:
return json.load(f)
class BackendUnavailable(Exception):
"""Will be raised if the backend cannot be imported in the hook process."""
+ def __init__(self, traceback):
+ self.traceback = traceback
- def __init__(
- self,
- traceback: str,
- message: Optional[str] = None,
- backend_name: Optional[str] = None,
- backend_path: Optional[Sequence[str]] = None,
- ) -> None:
- # Preserving arg order for the sake of API backward compatibility.
+
+class BackendInvalid(Exception):
+ """Will be raised if the backend is invalid."""
+ def __init__(self, backend_name, backend_path, message):
+ super().__init__(message)
self.backend_name = backend_name
self.backend_path = backend_path
- self.traceback = traceback
- super().__init__(message or "Error while importing backend")
class HookMissing(Exception):
"""Will be raised on missing hooks (if a fallback can't be used)."""
-
- def __init__(self, hook_name: str) -> None:
+ def __init__(self, hook_name):
super().__init__(hook_name)
self.hook_name = hook_name
class UnsupportedOperation(Exception):
"""May be raised by build_sdist if the backend indicates that it can't."""
-
- def __init__(self, traceback: str) -> None:
+ def __init__(self, traceback):
self.traceback = traceback
-def default_subprocess_runner(
- cmd: Sequence[str],
- cwd: Optional[str] = None,
- extra_environ: Optional[Mapping[str, str]] = None,
-) -> None:
+def default_subprocess_runner(cmd, cwd=None, extra_environ=None):
"""The default method of calling the wrapper subprocess.
This uses :func:`subprocess.check_call` under the hood.
@@ -83,11 +59,7 @@ def default_subprocess_runner(
check_call(cmd, cwd=cwd, env=env)
-def quiet_subprocess_runner(
- cmd: Sequence[str],
- cwd: Optional[str] = None,
- extra_environ: Optional[Mapping[str, str]] = None,
-) -> None:
+def quiet_subprocess_runner(cmd, cwd=None, extra_environ=None):
"""Call the subprocess while suppressing output.
This uses :func:`subprocess.check_output` under the hood.
@@ -99,7 +71,7 @@ def quiet_subprocess_runner(
check_output(cmd, cwd=cwd, env=env, stderr=STDOUT)
-def norm_and_check(source_tree: str, requested: str) -> str:
+def norm_and_check(source_tree, requested):
"""Normalise and check a backend path.
Ensure that the requested backend path is specified as a relative path,
@@ -124,16 +96,17 @@ def norm_and_check(source_tree: str, requested: str) -> str:
class BuildBackendHookCaller:
- """A wrapper to call the build backend hooks for a source directory."""
+ """A wrapper to call the build backend hooks for a source directory.
+ """
def __init__(
- self,
- source_dir: str,
- build_backend: str,
- backend_path: Optional[Sequence[str]] = None,
- runner: Optional["SubprocessRunner"] = None,
- python_executable: Optional[str] = None,
- ) -> None:
+ self,
+ source_dir,
+ build_backend,
+ backend_path=None,
+ runner=None,
+ python_executable=None,
+ ):
"""
:param source_dir: The source directory to invoke the build backend for
:param build_backend: The build backend spec
@@ -148,7 +121,9 @@ def __init__(
self.source_dir = abspath(source_dir)
self.build_backend = build_backend
if backend_path:
- backend_path = [norm_and_check(self.source_dir, p) for p in backend_path]
+ backend_path = [
+ norm_and_check(self.source_dir, p) for p in backend_path
+ ]
self.backend_path = backend_path
self._subprocess_runner = runner
if not python_executable:
@@ -156,12 +131,10 @@ def __init__(
self.python_executable = python_executable
@contextmanager
- def subprocess_runner(self, runner: "SubprocessRunner") -> Iterator[None]:
+ def subprocess_runner(self, runner):
"""A context manager for temporarily overriding the default
:ref:`subprocess runner `.
- :param runner: The new subprocess runner to use within the context.
-
.. code-block:: python
hook_caller = BuildBackendHookCaller(...)
@@ -175,44 +148,33 @@ def subprocess_runner(self, runner: "SubprocessRunner") -> Iterator[None]:
finally:
self._subprocess_runner = prev
- def _supported_features(self) -> Sequence[str]:
+ def _supported_features(self):
"""Return the list of optional features supported by the backend."""
- return self._call_hook("_supported_features", {})
+ return self._call_hook('_supported_features', {})
- def get_requires_for_build_wheel(
- self,
- config_settings: Optional[Mapping[str, Any]] = None,
- ) -> Sequence[str]:
+ def get_requires_for_build_wheel(self, config_settings=None):
"""Get additional dependencies required for building a wheel.
- :param config_settings: The configuration settings for the build backend
:returns: A list of :pep:`dependency specifiers <508>`.
+ :rtype: list[str]
.. admonition:: Fallback
If the build backend does not defined a hook with this name, an
empty list will be returned.
"""
- return self._call_hook(
- "get_requires_for_build_wheel", {"config_settings": config_settings}
- )
+ return self._call_hook('get_requires_for_build_wheel', {
+ 'config_settings': config_settings
+ })
def prepare_metadata_for_build_wheel(
- self,
- metadata_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
- _allow_fallback: bool = True,
- ) -> str:
+ self, metadata_directory, config_settings=None,
+ _allow_fallback=True):
"""Prepare a ``*.dist-info`` folder with metadata for this project.
- :param metadata_directory: The directory to write the metadata to
- :param config_settings: The configuration settings for the build backend
- :param _allow_fallback:
- Whether to allow the fallback to building a wheel and extracting
- the metadata from it. Should be passed as a keyword argument only.
-
:returns: Name of the newly created subfolder within
``metadata_directory``, containing the metadata.
+ :rtype: str
.. admonition:: Fallback
@@ -221,26 +183,17 @@ def prepare_metadata_for_build_wheel(
wheel via the ``build_wheel`` hook and the dist-info extracted from
that will be returned.
"""
- return self._call_hook(
- "prepare_metadata_for_build_wheel",
- {
- "metadata_directory": abspath(metadata_directory),
- "config_settings": config_settings,
- "_allow_fallback": _allow_fallback,
- },
- )
+ return self._call_hook('prepare_metadata_for_build_wheel', {
+ 'metadata_directory': abspath(metadata_directory),
+ 'config_settings': config_settings,
+ '_allow_fallback': _allow_fallback,
+ })
def build_wheel(
- self,
- wheel_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
- metadata_directory: Optional[str] = None,
- ) -> str:
+ self, wheel_directory, config_settings=None,
+ metadata_directory=None):
"""Build a wheel from this project.
- :param wheel_directory: The directory to write the wheel to
- :param config_settings: The configuration settings for the build backend
- :param metadata_directory: The directory to reuse existing metadata from
:returns:
The name of the newly created wheel within ``wheel_directory``.
@@ -253,48 +206,35 @@ def build_wheel(
"""
if metadata_directory is not None:
metadata_directory = abspath(metadata_directory)
- return self._call_hook(
- "build_wheel",
- {
- "wheel_directory": abspath(wheel_directory),
- "config_settings": config_settings,
- "metadata_directory": metadata_directory,
- },
- )
-
- def get_requires_for_build_editable(
- self,
- config_settings: Optional[Mapping[str, Any]] = None,
- ) -> Sequence[str]:
+ return self._call_hook('build_wheel', {
+ 'wheel_directory': abspath(wheel_directory),
+ 'config_settings': config_settings,
+ 'metadata_directory': metadata_directory,
+ })
+
+ def get_requires_for_build_editable(self, config_settings=None):
"""Get additional dependencies required for building an editable wheel.
- :param config_settings: The configuration settings for the build backend
:returns: A list of :pep:`dependency specifiers <508>`.
+ :rtype: list[str]
.. admonition:: Fallback
If the build backend does not defined a hook with this name, an
empty list will be returned.
"""
- return self._call_hook(
- "get_requires_for_build_editable", {"config_settings": config_settings}
- )
+ return self._call_hook('get_requires_for_build_editable', {
+ 'config_settings': config_settings
+ })
def prepare_metadata_for_build_editable(
- self,
- metadata_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
- _allow_fallback: bool = True,
- ) -> Optional[str]:
+ self, metadata_directory, config_settings=None,
+ _allow_fallback=True):
"""Prepare a ``*.dist-info`` folder with metadata for this project.
- :param metadata_directory: The directory to write the metadata to
- :param config_settings: The configuration settings for the build backend
- :param _allow_fallback:
- Whether to allow the fallback to building a wheel and extracting
- the metadata from it. Should be passed as a keyword argument only.
:returns: Name of the newly created subfolder within
``metadata_directory``, containing the metadata.
+ :rtype: str
.. admonition:: Fallback
@@ -303,26 +243,17 @@ def prepare_metadata_for_build_editable(
wheel via the ``build_editable`` hook and the dist-info
extracted from that will be returned.
"""
- return self._call_hook(
- "prepare_metadata_for_build_editable",
- {
- "metadata_directory": abspath(metadata_directory),
- "config_settings": config_settings,
- "_allow_fallback": _allow_fallback,
- },
- )
+ return self._call_hook('prepare_metadata_for_build_editable', {
+ 'metadata_directory': abspath(metadata_directory),
+ 'config_settings': config_settings,
+ '_allow_fallback': _allow_fallback,
+ })
def build_editable(
- self,
- wheel_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
- metadata_directory: Optional[str] = None,
- ) -> str:
+ self, wheel_directory, config_settings=None,
+ metadata_directory=None):
"""Build an editable wheel from this project.
- :param wheel_directory: The directory to write the wheel to
- :param config_settings: The configuration settings for the build backend
- :param metadata_directory: The directory to reuse existing metadata from
:returns:
The name of the newly created wheel within ``wheel_directory``.
@@ -336,55 +267,43 @@ def build_editable(
"""
if metadata_directory is not None:
metadata_directory = abspath(metadata_directory)
- return self._call_hook(
- "build_editable",
- {
- "wheel_directory": abspath(wheel_directory),
- "config_settings": config_settings,
- "metadata_directory": metadata_directory,
- },
- )
-
- def get_requires_for_build_sdist(
- self,
- config_settings: Optional[Mapping[str, Any]] = None,
- ) -> Sequence[str]:
+ return self._call_hook('build_editable', {
+ 'wheel_directory': abspath(wheel_directory),
+ 'config_settings': config_settings,
+ 'metadata_directory': metadata_directory,
+ })
+
+ def get_requires_for_build_sdist(self, config_settings=None):
"""Get additional dependencies required for building an sdist.
:returns: A list of :pep:`dependency specifiers <508>`.
+ :rtype: list[str]
"""
- return self._call_hook(
- "get_requires_for_build_sdist", {"config_settings": config_settings}
- )
-
- def build_sdist(
- self,
- sdist_directory: str,
- config_settings: Optional[Mapping[str, Any]] = None,
- ) -> str:
+ return self._call_hook('get_requires_for_build_sdist', {
+ 'config_settings': config_settings
+ })
+
+ def build_sdist(self, sdist_directory, config_settings=None):
"""Build an sdist from this project.
:returns:
The name of the newly created sdist within ``wheel_directory``.
"""
- return self._call_hook(
- "build_sdist",
- {
- "sdist_directory": abspath(sdist_directory),
- "config_settings": config_settings,
- },
- )
+ return self._call_hook('build_sdist', {
+ 'sdist_directory': abspath(sdist_directory),
+ 'config_settings': config_settings,
+ })
- def _call_hook(self, hook_name: str, kwargs: Mapping[str, Any]) -> Any:
- extra_environ = {"_PYPROJECT_HOOKS_BUILD_BACKEND": self.build_backend}
+ def _call_hook(self, hook_name, kwargs):
+ extra_environ = {'PEP517_BUILD_BACKEND': self.build_backend}
if self.backend_path:
backend_path = os.pathsep.join(self.backend_path)
- extra_environ["_PYPROJECT_HOOKS_BACKEND_PATH"] = backend_path
+ extra_environ['PEP517_BACKEND_PATH'] = backend_path
with tempfile.TemporaryDirectory() as td:
- hook_input = {"kwargs": kwargs}
- write_json(hook_input, pjoin(td, "input.json"), indent=2)
+ hook_input = {'kwargs': kwargs}
+ write_json(hook_input, pjoin(td, 'input.json'), indent=2)
# Run the hook in a subprocess
with _in_proc_script_path() as script:
@@ -392,19 +311,20 @@ def _call_hook(self, hook_name: str, kwargs: Mapping[str, Any]) -> Any:
self._subprocess_runner(
[python, abspath(str(script)), hook_name, td],
cwd=self.source_dir,
- extra_environ=extra_environ,
+ extra_environ=extra_environ
)
- data = read_json(pjoin(td, "output.json"))
- if data.get("unsupported"):
- raise UnsupportedOperation(data.get("traceback", ""))
- if data.get("no_backend"):
- raise BackendUnavailable(
- data.get("traceback", ""),
- message=data.get("backend_error", ""),
+ data = read_json(pjoin(td, 'output.json'))
+ if data.get('unsupported'):
+ raise UnsupportedOperation(data.get('traceback', ''))
+ if data.get('no_backend'):
+ raise BackendUnavailable(data.get('traceback', ''))
+ if data.get('backend_invalid'):
+ raise BackendInvalid(
backend_name=self.build_backend,
backend_path=self.backend_path,
+ message=data.get('backend_error', '')
)
- if data.get("hook_missing"):
- raise HookMissing(data.get("missing_hook_name") or hook_name)
- return data["return_val"]
+ if data.get('hook_missing'):
+ raise HookMissing(data.get('missing_hook_name') or hook_name)
+ return data['return_val']
diff --git a/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_in_process/__init__.py b/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_in_process/__init__.py
index 906d0ba2..917fa065 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_in_process/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_in_process/__init__.py
@@ -11,11 +11,8 @@
except AttributeError:
# Python 3.8 compatibility
def _in_proc_script_path():
- return resources.path(__package__, "_in_process.py")
-
+ return resources.path(__package__, '_in_process.py')
else:
-
def _in_proc_script_path():
return resources.as_file(
- resources.files(__package__).joinpath("_in_process.py")
- )
+ resources.files(__package__).joinpath('_in_process.py'))
diff --git a/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py b/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py
index d689bab7..ee511ff2 100644
--- a/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py
+++ b/venv1/Lib/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py
@@ -3,8 +3,8 @@
It expects:
- Command line args: hook_name, control_dir
- Environment variables:
- _PYPROJECT_HOOKS_BUILD_BACKEND=entry.point:spec
- _PYPROJECT_HOOKS_BACKEND_PATH=paths (separated with os.pathsep)
+ PEP517_BUILD_BACKEND=entry.point:spec
+ PEP517_BACKEND_PATH=paths (separated with os.pathsep)
- control_dir/input.json:
- {"kwargs": {...}}
@@ -21,7 +21,6 @@
import traceback
from glob import glob
from importlib import import_module
-from importlib.machinery import PathFinder
from os.path import join as pjoin
# This file is run as a script, and `import wrappers` is not zip-safe, so we
@@ -29,93 +28,69 @@
def write_json(obj, path, **kwargs):
- with open(path, "w", encoding="utf-8") as f:
+ with open(path, 'w', encoding='utf-8') as f:
json.dump(obj, f, **kwargs)
def read_json(path):
- with open(path, encoding="utf-8") as f:
+ with open(path, encoding='utf-8') as f:
return json.load(f)
class BackendUnavailable(Exception):
"""Raised if we cannot import the backend"""
+ def __init__(self, traceback):
+ self.traceback = traceback
- def __init__(self, message, traceback=None):
- super().__init__(message)
+
+class BackendInvalid(Exception):
+ """Raised if the backend is invalid"""
+ def __init__(self, message):
self.message = message
- self.traceback = traceback
class HookMissing(Exception):
"""Raised if a hook is missing and we are not executing the fallback"""
-
def __init__(self, hook_name=None):
super().__init__(hook_name)
self.hook_name = hook_name
+def contained_in(filename, directory):
+ """Test if a file is located within the given directory."""
+ filename = os.path.normcase(os.path.abspath(filename))
+ directory = os.path.normcase(os.path.abspath(directory))
+ return os.path.commonprefix([filename, directory]) == directory
+
+
def _build_backend():
"""Find and load the build backend"""
- backend_path = os.environ.get("_PYPROJECT_HOOKS_BACKEND_PATH")
- ep = os.environ["_PYPROJECT_HOOKS_BUILD_BACKEND"]
- mod_path, _, obj_path = ep.partition(":")
-
+ # Add in-tree backend directories to the front of sys.path.
+ backend_path = os.environ.get('PEP517_BACKEND_PATH')
if backend_path:
- # Ensure in-tree backend directories have the highest priority when importing.
extra_pathitems = backend_path.split(os.pathsep)
- sys.meta_path.insert(0, _BackendPathFinder(extra_pathitems, mod_path))
+ sys.path[:0] = extra_pathitems
+ ep = os.environ['PEP517_BUILD_BACKEND']
+ mod_path, _, obj_path = ep.partition(':')
try:
obj = import_module(mod_path)
except ImportError:
- msg = f"Cannot import {mod_path!r}"
- raise BackendUnavailable(msg, traceback.format_exc())
+ raise BackendUnavailable(traceback.format_exc())
+
+ if backend_path:
+ if not any(
+ contained_in(obj.__file__, path)
+ for path in extra_pathitems
+ ):
+ raise BackendInvalid("Backend was not loaded from backend-path")
if obj_path:
- for path_part in obj_path.split("."):
+ for path_part in obj_path.split('.'):
obj = getattr(obj, path_part)
return obj
-class _BackendPathFinder:
- """Implements the MetaPathFinder interface to locate modules in ``backend-path``.
-
- Since the environment provided by the frontend can contain all sorts of
- MetaPathFinders, the only way to ensure the backend is loaded from the
- right place is to prepend our own.
- """
-
- def __init__(self, backend_path, backend_module):
- self.backend_path = backend_path
- self.backend_module = backend_module
- self.backend_parent, _, _ = backend_module.partition(".")
-
- def find_spec(self, fullname, _path, _target=None):
- if "." in fullname:
- # Rely on importlib to find nested modules based on parent's path
- return None
-
- # Ignore other items in _path or sys.path and use backend_path instead:
- spec = PathFinder.find_spec(fullname, path=self.backend_path)
- if spec is None and fullname == self.backend_parent:
- # According to the spec, the backend MUST be loaded from backend-path.
- # Therefore, we can halt the import machinery and raise a clean error.
- msg = f"Cannot find module {self.backend_module!r} in {self.backend_path!r}"
- raise BackendUnavailable(msg)
-
- return spec
-
- if sys.version_info >= (3, 8):
-
- def find_distributions(self, context=None):
- # Delayed import: Python 3.7 does not contain importlib.metadata
- from importlib.metadata import DistributionFinder, MetadataPathFinder
-
- context = DistributionFinder.Context(path=self.backend_path)
- return MetadataPathFinder.find_distributions(context=context)
-
-
def _supported_features():
"""Return the list of options features supported by the backend.
@@ -158,8 +133,7 @@ def get_requires_for_build_editable(config_settings):
def prepare_metadata_for_build_wheel(
- metadata_directory, config_settings, _allow_fallback
-):
+ metadata_directory, config_settings, _allow_fallback):
"""Invoke optional prepare_metadata_for_build_wheel
Implements a fallback by building a wheel if the hook isn't defined,
@@ -176,14 +150,12 @@ def prepare_metadata_for_build_wheel(
# fallback to build_wheel outside the try block to avoid exception chaining
# which can be confusing to users and is not relevant
whl_basename = backend.build_wheel(metadata_directory, config_settings)
- return _get_wheel_metadata_from_wheel(
- whl_basename, metadata_directory, config_settings
- )
+ return _get_wheel_metadata_from_wheel(whl_basename, metadata_directory,
+ config_settings)
def prepare_metadata_for_build_editable(
- metadata_directory, config_settings, _allow_fallback
-):
+ metadata_directory, config_settings, _allow_fallback):
"""Invoke optional prepare_metadata_for_build_editable
Implements a fallback by building an editable wheel if the hook isn't
@@ -199,24 +171,24 @@ def prepare_metadata_for_build_editable(
try:
build_hook = backend.build_editable
except AttributeError:
- raise HookMissing(hook_name="build_editable")
+ raise HookMissing(hook_name='build_editable')
else:
whl_basename = build_hook(metadata_directory, config_settings)
- return _get_wheel_metadata_from_wheel(
- whl_basename, metadata_directory, config_settings
- )
+ return _get_wheel_metadata_from_wheel(whl_basename,
+ metadata_directory,
+ config_settings)
else:
return hook(metadata_directory, config_settings)
-WHEEL_BUILT_MARKER = "PYPROJECT_HOOKS_ALREADY_BUILT_WHEEL"
+WHEEL_BUILT_MARKER = 'PEP517_ALREADY_BUILT_WHEEL'
def _dist_info_files(whl_zip):
"""Identify the .dist-info folder inside a wheel ZipFile."""
res = []
for path in whl_zip.namelist():
- m = re.match(r"[^/\\]+-[^/\\]+\.dist-info/", path)
+ m = re.match(r'[^/\\]+-[^/\\]+\.dist-info/', path)
if m:
res.append(path)
if res:
@@ -224,41 +196,40 @@ def _dist_info_files(whl_zip):
raise Exception("No .dist-info folder found in wheel")
-def _get_wheel_metadata_from_wheel(whl_basename, metadata_directory, config_settings):
+def _get_wheel_metadata_from_wheel(
+ whl_basename, metadata_directory, config_settings):
"""Extract the metadata from a wheel.
Fallback for when the build backend does not
define the 'get_wheel_metadata' hook.
"""
from zipfile import ZipFile
-
- with open(os.path.join(metadata_directory, WHEEL_BUILT_MARKER), "wb"):
+ with open(os.path.join(metadata_directory, WHEEL_BUILT_MARKER), 'wb'):
pass # Touch marker file
whl_file = os.path.join(metadata_directory, whl_basename)
with ZipFile(whl_file) as zipf:
dist_info = _dist_info_files(zipf)
zipf.extractall(path=metadata_directory, members=dist_info)
- return dist_info[0].split("/")[0]
+ return dist_info[0].split('/')[0]
def _find_already_built_wheel(metadata_directory):
- """Check for a wheel already built during the get_wheel_metadata hook."""
+ """Check for a wheel already built during the get_wheel_metadata hook.
+ """
if not metadata_directory:
return None
metadata_parent = os.path.dirname(metadata_directory)
if not os.path.isfile(pjoin(metadata_parent, WHEEL_BUILT_MARKER)):
return None
- whl_files = glob(os.path.join(metadata_parent, "*.whl"))
+ whl_files = glob(os.path.join(metadata_parent, '*.whl'))
if not whl_files:
- print("Found wheel built marker, but no .whl files")
+ print('Found wheel built marker, but no .whl files')
return None
if len(whl_files) > 1:
- print(
- "Found multiple .whl files; unspecified behaviour. "
- "Will call build_wheel."
- )
+ print('Found multiple .whl files; unspecified behaviour. '
+ 'Will call build_wheel.')
return None
# Exactly one .whl file
@@ -277,9 +248,8 @@ def build_wheel(wheel_directory, config_settings, metadata_directory=None):
shutil.copy2(prebuilt_whl, wheel_directory)
return os.path.basename(prebuilt_whl)
- return _build_backend().build_wheel(
- wheel_directory, config_settings, metadata_directory
- )
+ return _build_backend().build_wheel(wheel_directory, config_settings,
+ metadata_directory)
def build_editable(wheel_directory, config_settings, metadata_directory=None):
@@ -323,7 +293,6 @@ class _DummyException(Exception):
class GotUnsupportedOperation(Exception):
"""For internal use when backend raises UnsupportedOperation"""
-
def __init__(self, traceback):
self.traceback = traceback
@@ -333,20 +302,20 @@ def build_sdist(sdist_directory, config_settings):
backend = _build_backend()
try:
return backend.build_sdist(sdist_directory, config_settings)
- except getattr(backend, "UnsupportedOperation", _DummyException):
+ except getattr(backend, 'UnsupportedOperation', _DummyException):
raise GotUnsupportedOperation(traceback.format_exc())
HOOK_NAMES = {
- "get_requires_for_build_wheel",
- "prepare_metadata_for_build_wheel",
- "build_wheel",
- "get_requires_for_build_editable",
- "prepare_metadata_for_build_editable",
- "build_editable",
- "get_requires_for_build_sdist",
- "build_sdist",
- "_supported_features",
+ 'get_requires_for_build_wheel',
+ 'prepare_metadata_for_build_wheel',
+ 'build_wheel',
+ 'get_requires_for_build_editable',
+ 'prepare_metadata_for_build_editable',
+ 'build_editable',
+ 'get_requires_for_build_sdist',
+ 'build_sdist',
+ '_supported_features',
}
@@ -357,33 +326,28 @@ def main():
control_dir = sys.argv[2]
if hook_name not in HOOK_NAMES:
sys.exit("Unknown hook: %s" % hook_name)
-
- # Remove the parent directory from sys.path to avoid polluting the backend
- # import namespace with this directory.
- here = os.path.dirname(__file__)
- if here in sys.path:
- sys.path.remove(here)
-
hook = globals()[hook_name]
- hook_input = read_json(pjoin(control_dir, "input.json"))
+ hook_input = read_json(pjoin(control_dir, 'input.json'))
- json_out = {"unsupported": False, "return_val": None}
+ json_out = {'unsupported': False, 'return_val': None}
try:
- json_out["return_val"] = hook(**hook_input["kwargs"])
+ json_out['return_val'] = hook(**hook_input['kwargs'])
except BackendUnavailable as e:
- json_out["no_backend"] = True
- json_out["traceback"] = e.traceback
- json_out["backend_error"] = e.message
+ json_out['no_backend'] = True
+ json_out['traceback'] = e.traceback
+ except BackendInvalid as e:
+ json_out['backend_invalid'] = True
+ json_out['backend_error'] = e.message
except GotUnsupportedOperation as e:
- json_out["unsupported"] = True
- json_out["traceback"] = e.traceback
+ json_out['unsupported'] = True
+ json_out['traceback'] = e.traceback
except HookMissing as e:
- json_out["hook_missing"] = True
- json_out["missing_hook_name"] = e.hook_name or hook_name
+ json_out['hook_missing'] = True
+ json_out['missing_hook_name'] = e.hook_name or hook_name
- write_json(json_out, pjoin(control_dir, "output.json"), indent=2)
+ write_json(json_out, pjoin(control_dir, 'output.json'), indent=2)
-if __name__ == "__main__":
+if __name__ == '__main__':
main()
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/__init__.py b/venv1/Lib/site-packages/pip/_vendor/requests/__init__.py
index 04230fc8..a4776248 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/__init__.py
@@ -45,7 +45,11 @@
from .exceptions import RequestsDependencyWarning
charset_normalizer_version = None
-chardet_version = None
+
+try:
+ from pip._vendor.chardet import __version__ as chardet_version
+except ImportError:
+ chardet_version = None
def check_compatibility(urllib3_version, chardet_version, charset_normalizer_version):
@@ -59,10 +63,10 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
# Check urllib3 for compatibility.
major, minor, patch = urllib3_version # noqa: F811
major, minor, patch = int(major), int(minor), int(patch)
- # urllib3 >= 1.21.1
- assert major >= 1
- if major == 1:
- assert minor >= 21
+ # urllib3 >= 1.21.1, <= 1.26
+ assert major == 1
+ assert minor >= 21
+ assert minor <= 26
# Check charset_normalizer for compatibility.
if chardet_version:
@@ -76,8 +80,7 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
# charset_normalizer >= 2.0.0 < 4.0.0
assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
else:
- # pip does not need or use character detection
- pass
+ raise Exception("You need either charset_normalizer or chardet installed")
def _check_cryptography(cryptography_version):
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/__version__.py b/venv1/Lib/site-packages/pip/_vendor/requests/__version__.py
index effdd98c..69be3dec 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/__version__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/__version__.py
@@ -5,10 +5,10 @@
__title__ = "requests"
__description__ = "Python HTTP for Humans."
__url__ = "https://requests.readthedocs.io"
-__version__ = "2.32.5"
-__build__ = 0x023205
+__version__ = "2.28.2"
+__build__ = 0x022802
__author__ = "Kenneth Reitz"
__author_email__ = "me@kennethreitz.org"
-__license__ = "Apache-2.0"
+__license__ = "Apache 2.0"
__copyright__ = "Copyright Kenneth Reitz"
__cake__ = "\u2728 \U0001f370 \u2728"
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/_internal_utils.py b/venv1/Lib/site-packages/pip/_vendor/requests/_internal_utils.py
index f2cf635e..7dc9bc53 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/_internal_utils.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/_internal_utils.py
@@ -14,11 +14,9 @@
_VALID_HEADER_VALUE_RE_BYTE = re.compile(rb"^\S[^\r\n]*$|^$")
_VALID_HEADER_VALUE_RE_STR = re.compile(r"^\S[^\r\n]*$|^$")
-_HEADER_VALIDATORS_STR = (_VALID_HEADER_NAME_RE_STR, _VALID_HEADER_VALUE_RE_STR)
-_HEADER_VALIDATORS_BYTE = (_VALID_HEADER_NAME_RE_BYTE, _VALID_HEADER_VALUE_RE_BYTE)
HEADER_VALIDATORS = {
- bytes: _HEADER_VALIDATORS_BYTE,
- str: _HEADER_VALIDATORS_STR,
+ bytes: (_VALID_HEADER_NAME_RE_BYTE, _VALID_HEADER_VALUE_RE_BYTE),
+ str: (_VALID_HEADER_NAME_RE_STR, _VALID_HEADER_VALUE_RE_STR),
}
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/adapters.py b/venv1/Lib/site-packages/pip/_vendor/requests/adapters.py
index 67ccebcb..f68f7d46 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/adapters.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/adapters.py
@@ -8,8 +8,6 @@
import os.path
import socket # noqa: F401
-import typing
-import warnings
from pip._vendor.urllib3.exceptions import ClosedPoolError, ConnectTimeoutError
from pip._vendor.urllib3.exceptions import HTTPError as _HTTPError
@@ -24,6 +22,7 @@
from pip._vendor.urllib3.exceptions import ReadTimeoutError, ResponseError
from pip._vendor.urllib3.exceptions import SSLError as _SSLError
from pip._vendor.urllib3.poolmanager import PoolManager, proxy_from_url
+from pip._vendor.urllib3.response import HTTPResponse
from pip._vendor.urllib3.util import Timeout as TimeoutSauce
from pip._vendor.urllib3.util import parse_url
from pip._vendor.urllib3.util.retry import Retry
@@ -63,53 +62,12 @@ def SOCKSProxyManager(*args, **kwargs):
raise InvalidSchema("Missing dependencies for SOCKS support.")
-if typing.TYPE_CHECKING:
- from .models import PreparedRequest
-
-
DEFAULT_POOLBLOCK = False
DEFAULT_POOLSIZE = 10
DEFAULT_RETRIES = 0
DEFAULT_POOL_TIMEOUT = None
-def _urllib3_request_context(
- request: "PreparedRequest",
- verify: "bool | str | None",
- client_cert: "typing.Tuple[str, str] | str | None",
- poolmanager: "PoolManager",
-) -> "(typing.Dict[str, typing.Any], typing.Dict[str, typing.Any])":
- host_params = {}
- pool_kwargs = {}
- parsed_request_url = urlparse(request.url)
- scheme = parsed_request_url.scheme.lower()
- port = parsed_request_url.port
-
- cert_reqs = "CERT_REQUIRED"
- if verify is False:
- cert_reqs = "CERT_NONE"
- elif isinstance(verify, str):
- if not os.path.isdir(verify):
- pool_kwargs["ca_certs"] = verify
- else:
- pool_kwargs["ca_cert_dir"] = verify
- pool_kwargs["cert_reqs"] = cert_reqs
- if client_cert is not None:
- if isinstance(client_cert, tuple) and len(client_cert) == 2:
- pool_kwargs["cert_file"] = client_cert[0]
- pool_kwargs["key_file"] = client_cert[1]
- else:
- # According to our docs, we allow users to specify just the client
- # cert path
- pool_kwargs["cert_file"] = client_cert
- host_params = {
- "scheme": scheme,
- "host": parsed_request_url.hostname,
- "port": port,
- }
- return host_params, pool_kwargs
-
-
class BaseAdapter:
"""The Base Transport Adapter"""
@@ -236,6 +194,7 @@ def init_poolmanager(
num_pools=connections,
maxsize=maxsize,
block=block,
+ strict=True,
**pool_kwargs,
)
@@ -290,6 +249,7 @@ def cert_verify(self, conn, url, verify, cert):
:param cert: The SSL certificate to verify.
"""
if url.lower().startswith("https") and verify:
+
cert_loc = None
# Allow self-specified cert location.
@@ -370,110 +330,8 @@ def build_response(self, req, resp):
return response
- def build_connection_pool_key_attributes(self, request, verify, cert=None):
- """Build the PoolKey attributes used by urllib3 to return a connection.
-
- This looks at the PreparedRequest, the user-specified verify value,
- and the value of the cert parameter to determine what PoolKey values
- to use to select a connection from a given urllib3 Connection Pool.
-
- The SSL related pool key arguments are not consistently set. As of
- this writing, use the following to determine what keys may be in that
- dictionary:
-
- * If ``verify`` is ``True``, ``"ssl_context"`` will be set and will be the
- default Requests SSL Context
- * If ``verify`` is ``False``, ``"ssl_context"`` will not be set but
- ``"cert_reqs"`` will be set
- * If ``verify`` is a string, (i.e., it is a user-specified trust bundle)
- ``"ca_certs"`` will be set if the string is not a directory recognized
- by :py:func:`os.path.isdir`, otherwise ``"ca_cert_dir"`` will be
- set.
- * If ``"cert"`` is specified, ``"cert_file"`` will always be set. If
- ``"cert"`` is a tuple with a second item, ``"key_file"`` will also
- be present
-
- To override these settings, one may subclass this class, call this
- method and use the above logic to change parameters as desired. For
- example, if one wishes to use a custom :py:class:`ssl.SSLContext` one
- must both set ``"ssl_context"`` and based on what else they require,
- alter the other keys to ensure the desired behaviour.
-
- :param request:
- The PreparedReqest being sent over the connection.
- :type request:
- :class:`~requests.models.PreparedRequest`
- :param verify:
- Either a boolean, in which case it controls whether
- we verify the server's TLS certificate, or a string, in which case it
- must be a path to a CA bundle to use.
- :param cert:
- (optional) Any user-provided SSL certificate for client
- authentication (a.k.a., mTLS). This may be a string (i.e., just
- the path to a file which holds both certificate and key) or a
- tuple of length 2 with the certificate file path and key file
- path.
- :returns:
- A tuple of two dictionaries. The first is the "host parameters"
- portion of the Pool Key including scheme, hostname, and port. The
- second is a dictionary of SSLContext related parameters.
- """
- return _urllib3_request_context(request, verify, cert, self.poolmanager)
-
- def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None):
- """Returns a urllib3 connection for the given request and TLS settings.
- This should not be called from user code, and is only exposed for use
- when subclassing the :class:`HTTPAdapter `.
-
- :param request:
- The :class:`PreparedRequest ` object to be sent
- over the connection.
- :param verify:
- Either a boolean, in which case it controls whether we verify the
- server's TLS certificate, or a string, in which case it must be a
- path to a CA bundle to use.
- :param proxies:
- (optional) The proxies dictionary to apply to the request.
- :param cert:
- (optional) Any user-provided SSL certificate to be used for client
- authentication (a.k.a., mTLS).
- :rtype:
- urllib3.ConnectionPool
- """
- proxy = select_proxy(request.url, proxies)
- try:
- host_params, pool_kwargs = self.build_connection_pool_key_attributes(
- request,
- verify,
- cert,
- )
- except ValueError as e:
- raise InvalidURL(e, request=request)
- if proxy:
- proxy = prepend_scheme_if_needed(proxy, "http")
- proxy_url = parse_url(proxy)
- if not proxy_url.host:
- raise InvalidProxyURL(
- "Please check proxy URL. It is malformed "
- "and could be missing the host."
- )
- proxy_manager = self.proxy_manager_for(proxy)
- conn = proxy_manager.connection_from_host(
- **host_params, pool_kwargs=pool_kwargs
- )
- else:
- # Only scheme should be lower case
- conn = self.poolmanager.connection_from_host(
- **host_params, pool_kwargs=pool_kwargs
- )
-
- return conn
-
def get_connection(self, url, proxies=None):
- """DEPRECATED: Users should move to `get_connection_with_tls_context`
- for all subclasses of HTTPAdapter using Requests>=2.32.2.
-
- Returns a urllib3 connection for the given URL. This should not be
+ """Returns a urllib3 connection for the given URL. This should not be
called from user code, and is only exposed for use when subclassing the
:class:`HTTPAdapter `.
@@ -481,15 +339,6 @@ def get_connection(self, url, proxies=None):
:param proxies: (optional) A Requests-style dictionary of proxies used on this request.
:rtype: urllib3.ConnectionPool
"""
- warnings.warn(
- (
- "`get_connection` has been deprecated in favor of "
- "`get_connection_with_tls_context`. Custom HTTPAdapter subclasses "
- "will need to migrate for Requests>=2.32.2. Please see "
- "https://github.com/psf/requests/pull/6710 for more details."
- ),
- DeprecationWarning,
- )
proxy = select_proxy(url, proxies)
if proxy:
@@ -544,9 +393,6 @@ def request_url(self, request, proxies):
using_socks_proxy = proxy_scheme.startswith("socks")
url = request.path_url
- if url.startswith("//"): # Don't confuse urllib3
- url = f"/{url.lstrip('/')}"
-
if is_proxied_http_request and not using_socks_proxy:
url = urldefragauth(request.url)
@@ -607,9 +453,7 @@ def send(
"""
try:
- conn = self.get_connection_with_tls_context(
- request, verify, proxies=proxies, cert=cert
- )
+ conn = self.get_connection(request.url, proxies)
except LocationValueError as e:
raise InvalidURL(e, request=request)
@@ -641,19 +485,63 @@ def send(
timeout = TimeoutSauce(connect=timeout, read=timeout)
try:
- resp = conn.urlopen(
- method=request.method,
- url=url,
- body=request.body,
- headers=request.headers,
- redirect=False,
- assert_same_host=False,
- preload_content=False,
- decode_content=False,
- retries=self.max_retries,
- timeout=timeout,
- chunked=chunked,
- )
+ if not chunked:
+ resp = conn.urlopen(
+ method=request.method,
+ url=url,
+ body=request.body,
+ headers=request.headers,
+ redirect=False,
+ assert_same_host=False,
+ preload_content=False,
+ decode_content=False,
+ retries=self.max_retries,
+ timeout=timeout,
+ )
+
+ # Send the request.
+ else:
+ if hasattr(conn, "proxy_pool"):
+ conn = conn.proxy_pool
+
+ low_conn = conn._get_conn(timeout=DEFAULT_POOL_TIMEOUT)
+
+ try:
+ skip_host = "Host" in request.headers
+ low_conn.putrequest(
+ request.method,
+ url,
+ skip_accept_encoding=True,
+ skip_host=skip_host,
+ )
+
+ for header, value in request.headers.items():
+ low_conn.putheader(header, value)
+
+ low_conn.endheaders()
+
+ for i in request.body:
+ low_conn.send(hex(len(i))[2:].encode("utf-8"))
+ low_conn.send(b"\r\n")
+ low_conn.send(i)
+ low_conn.send(b"\r\n")
+ low_conn.send(b"0\r\n\r\n")
+
+ # Receive the response from the server
+ r = low_conn.getresponse()
+
+ resp = HTTPResponse.from_httplib(
+ r,
+ pool=conn,
+ connection=low_conn,
+ preload_content=False,
+ decode_content=False,
+ )
+ except Exception:
+ # If we hit any problems here, clean up the connection.
+ # Then, raise so that we can handle the actual exception.
+ low_conn.close()
+ raise
except (ProtocolError, OSError) as err:
raise ConnectionError(err, request=request)
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/api.py b/venv1/Lib/site-packages/pip/_vendor/requests/api.py
index 59607445..2f71aaed 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/api.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/api.py
@@ -25,7 +25,7 @@ def request(method, url, **kwargs):
:param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
:param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': file-tuple}``) for multipart encoding upload.
``file-tuple`` can be a 2-tuple ``('filename', fileobj)``, 3-tuple ``('filename', fileobj, 'content_type')``
- or a 4-tuple ``('filename', fileobj, 'content_type', custom_headers)``, where ``'content_type'`` is a string
+ or a 4-tuple ``('filename', fileobj, 'content_type', custom_headers)``, where ``'content-type'`` is a string
defining the content type of the given file and ``custom_headers`` a dict-like object containing additional headers
to add for the file.
:param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
@@ -106,7 +106,7 @@ def post(url, data=None, json=None, **kwargs):
:param url: URL for the new :class:`Request` object.
:param data: (optional) Dictionary, list of tuples, bytes, or file-like
object to send in the body of the :class:`Request`.
- :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
+ :param json: (optional) json data to send in the body of the :class:`Request`.
:param \*\*kwargs: Optional arguments that ``request`` takes.
:return: :class:`Response ` object
:rtype: requests.Response
@@ -121,7 +121,7 @@ def put(url, data=None, **kwargs):
:param url: URL for the new :class:`Request` object.
:param data: (optional) Dictionary, list of tuples, bytes, or file-like
object to send in the body of the :class:`Request`.
- :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
+ :param json: (optional) json data to send in the body of the :class:`Request`.
:param \*\*kwargs: Optional arguments that ``request`` takes.
:return: :class:`Response ` object
:rtype: requests.Response
@@ -136,7 +136,7 @@ def patch(url, data=None, **kwargs):
:param url: URL for the new :class:`Request` object.
:param data: (optional) Dictionary, list of tuples, bytes, or file-like
object to send in the body of the :class:`Request`.
- :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
+ :param json: (optional) json data to send in the body of the :class:`Request`.
:param \*\*kwargs: Optional arguments that ``request`` takes.
:return: :class:`Response ` object
:rtype: requests.Response
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/auth.py b/venv1/Lib/site-packages/pip/_vendor/requests/auth.py
index 4a7ce6dc..9733686d 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/auth.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/auth.py
@@ -258,6 +258,7 @@ def handle_401(self, r, **kwargs):
s_auth = r.headers.get("www-authenticate", "")
if "digest" in s_auth.lower() and self._thread_local.num_401_calls < 2:
+
self._thread_local.num_401_calls += 1
pat = re.compile(r"digest ", flags=re.IGNORECASE)
self._thread_local.chal = parse_dict_header(pat.sub("", s_auth, count=1))
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/certs.py b/venv1/Lib/site-packages/pip/_vendor/requests/certs.py
index 2743144b..38696a1f 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/certs.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/certs.py
@@ -11,7 +11,14 @@
environment, you can change the definition of where() to return a separately
packaged CA bundle.
"""
-from pip._vendor.certifi import where
+
+import os
+
+if "_PIP_STANDALONE_CERT" not in os.environ:
+ from pip._vendor.certifi import where
+else:
+ def where():
+ return os.environ["_PIP_STANDALONE_CERT"]
if __name__ == "__main__":
print(where())
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/compat.py b/venv1/Lib/site-packages/pip/_vendor/requests/compat.py
index b95a9214..9ab2bb48 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/compat.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/compat.py
@@ -7,32 +7,9 @@
compatibility until the next major version.
"""
-import sys
-
-# -------
-# urllib3
-# -------
-from pip._vendor.urllib3 import __version__ as urllib3_version
-
-# Detect which major version of urllib3 is being used.
-try:
- is_urllib3_1 = int(urllib3_version.split(".")[0]) == 1
-except (TypeError, AttributeError):
- # If we can't discern a version, prefer old functionality.
- is_urllib3_1 = True
+from pip._vendor import chardet
-# -------------------
-# Character Detection
-# -------------------
-
-
-def _resolve_char_detection():
- """Find supported character detection libraries."""
- chardet = None
- return chardet
-
-
-chardet = _resolve_char_detection()
+import sys
# -------
# Pythons
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/cookies.py b/venv1/Lib/site-packages/pip/_vendor/requests/cookies.py
index f69d0cda..bf54ab23 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/cookies.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/cookies.py
@@ -2,7 +2,7 @@
requests.cookies
~~~~~~~~~~~~~~~~
-Compatibility code to be able to use `http.cookiejar.CookieJar` with requests.
+Compatibility code to be able to use `cookielib.CookieJar` with requests.
requests.utils imports from here, so be careful with imports.
"""
@@ -23,7 +23,7 @@
class MockRequest:
"""Wraps a `requests.Request` to mimic a `urllib2.Request`.
- The code in `http.cookiejar.CookieJar` expects this interface in order to correctly
+ The code in `cookielib.CookieJar` expects this interface in order to correctly
manage cookie policies, i.e., determine whether a cookie can be set, given the
domains of the request and the cookie.
@@ -76,7 +76,7 @@ def get_header(self, name, default=None):
return self._r.headers.get(name, self._new_headers.get(name, default))
def add_header(self, key, val):
- """cookiejar has no legitimate use for this method; add it back if you find one."""
+ """cookielib has no legitimate use for this method; add it back if you find one."""
raise NotImplementedError(
"Cookie headers should be added with add_unredirected_header()"
)
@@ -104,11 +104,11 @@ class MockResponse:
"""Wraps a `httplib.HTTPMessage` to mimic a `urllib.addinfourl`.
...what? Basically, expose the parsed HTTP headers from the server response
- the way `http.cookiejar` expects to see them.
+ the way `cookielib` expects to see them.
"""
def __init__(self, headers):
- """Make a MockResponse for `cookiejar` to read.
+ """Make a MockResponse for `cookielib` to read.
:param headers: a httplib.HTTPMessage or analogous carrying the headers
"""
@@ -124,7 +124,7 @@ def getheaders(self, name):
def extract_cookies_to_jar(jar, request, response):
"""Extract the cookies from the response into a CookieJar.
- :param jar: http.cookiejar.CookieJar (not necessarily a RequestsCookieJar)
+ :param jar: cookielib.CookieJar (not necessarily a RequestsCookieJar)
:param request: our own requests.Request object
:param response: urllib3.HTTPResponse object
"""
@@ -174,7 +174,7 @@ class CookieConflictError(RuntimeError):
class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
- """Compatibility class; is a http.cookiejar.CookieJar, but exposes a dict
+ """Compatibility class; is a cookielib.CookieJar, but exposes a dict
interface.
This is the CookieJar we create by default for requests and sessions that
@@ -341,7 +341,7 @@ def __setitem__(self, name, value):
self.set(name, value)
def __delitem__(self, name):
- """Deletes a cookie given a name. Wraps ``http.cookiejar.CookieJar``'s
+ """Deletes a cookie given a name. Wraps ``cookielib.CookieJar``'s
``remove_cookie_by_name()``.
"""
remove_cookie_by_name(self, name)
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/exceptions.py b/venv1/Lib/site-packages/pip/_vendor/requests/exceptions.py
index 7f3660f0..168d0739 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/exceptions.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/exceptions.py
@@ -41,16 +41,6 @@ def __init__(self, *args, **kwargs):
CompatJSONDecodeError.__init__(self, *args)
InvalidJSONError.__init__(self, *self.args, **kwargs)
- def __reduce__(self):
- """
- The __reduce__ method called when pickling the object must
- be the one from the JSONDecodeError (be it json/simplejson)
- as it expects all the arguments for instantiation, not just
- one like the IOError, and the MRO would by default call the
- __reduce__ method from the IOError due to the inheritance order.
- """
- return CompatJSONDecodeError.__reduce__(self)
-
class HTTPError(RequestException):
"""An HTTP error occurred."""
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/help.py b/venv1/Lib/site-packages/pip/_vendor/requests/help.py
index ddbb6150..2d292c2f 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/help.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/help.py
@@ -11,7 +11,11 @@
from . import __version__ as requests_version
charset_normalizer = None
-chardet = None
+
+try:
+ from pip._vendor import chardet
+except ImportError:
+ chardet = None
try:
from pip._vendor.urllib3.contrib import pyopenssl
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/models.py b/venv1/Lib/site-packages/pip/_vendor/requests/models.py
index 22de95c0..76e6f199 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/models.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/models.py
@@ -170,7 +170,7 @@ def _encode_files(files, data):
)
)
- for k, v in files:
+ for (k, v) in files:
# support for explicit filename
ft = None
fh = None
@@ -268,6 +268,7 @@ def __init__(
hooks=None,
json=None,
):
+
# Default empty dicts for dict params.
data = [] if data is None else data
files = [] if files is None else files
@@ -276,7 +277,7 @@ def __init__(
hooks = {} if hooks is None else hooks
self.hooks = default_hooks()
- for k, v in list(hooks.items()):
+ for (k, v) in list(hooks.items()):
self.register_hook(event=k, hook=v)
self.method = method
@@ -789,12 +790,7 @@ def next(self):
@property
def apparent_encoding(self):
"""The apparent encoding, provided by the charset_normalizer or chardet libraries."""
- if chardet is not None:
- return chardet.detect(self.content)["encoding"]
- else:
- # If no character detection library is available, we'll fall back
- # to a standard Python utf-8 str.
- return "utf-8"
+ return chardet.detect(self.content)["encoding"]
def iter_content(self, chunk_size=1, decode_unicode=False):
"""Iterates over the response data. When stream=True is set on the
@@ -869,6 +865,7 @@ def iter_lines(
for chunk in self.iter_content(
chunk_size=chunk_size, decode_unicode=decode_unicode
):
+
if pending is not None:
chunk = pending + chunk
@@ -945,9 +942,7 @@ def text(self):
return content
def json(self, **kwargs):
- r"""Decodes the JSON response body (if any) as a Python object.
-
- This may return a dictionary, list, etc. depending on what is in the response.
+ r"""Returns the json-encoded content of a response, if any.
:param \*\*kwargs: Optional arguments that ``json.loads`` takes.
:raises requests.exceptions.JSONDecodeError: If the response body does not
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/packages.py b/venv1/Lib/site-packages/pip/_vendor/requests/packages.py
index 200c3828..9582fa73 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/packages.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/packages.py
@@ -1,11 +1,9 @@
import sys
-from .compat import chardet
-
# This code exists for backwards compatibility reasons.
# I don't like it either. Just look the other way. :)
-for package in ("urllib3", "idna"):
+for package in ('urllib3', 'idna', 'chardet'):
vendored_package = "pip._vendor." + package
locals()[package] = __import__(vendored_package)
# This traversal is apparently necessary such that the identities are
@@ -15,11 +13,4 @@
unprefixed_mod = mod[len("pip._vendor."):]
sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
-if chardet is not None:
- target = chardet.__name__
- for mod in list(sys.modules):
- if mod == target or mod.startswith(f"{target}."):
- imported_mod = sys.modules[mod]
- sys.modules[f"requests.packages.{mod}"] = imported_mod
- mod = mod.replace(target, "chardet")
- sys.modules[f"requests.packages.{mod}"] = imported_mod
+# Kinda cool, though, right?
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/sessions.py b/venv1/Lib/site-packages/pip/_vendor/requests/sessions.py
index 731550de..6cb3b4da 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/sessions.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/sessions.py
@@ -262,6 +262,7 @@ def resolve_redirects(
if yield_requests:
yield req
else:
+
resp = self.send(
req,
stream=stream,
@@ -323,9 +324,7 @@ def rebuild_proxies(self, prepared_request, proxies):
except KeyError:
username, password = None, None
- # urllib3 handles proxy authorization for us in the standard adapter.
- # Avoid appending this to TLS tunneled requests where it may be leaked.
- if not scheme.startswith("https") and username and password:
+ if username and password:
headers["Proxy-Authorization"] = _basic_auth_str(username, password)
return new_proxies
@@ -388,6 +387,7 @@ class Session(SessionRedirectMixin):
]
def __init__(self):
+
#: A case-insensitive dictionary of headers to be sent on each
#: :class:`Request ` sent from this
#: :class:`Session `.
@@ -535,7 +535,7 @@ def request(
for multipart encoding upload.
:param auth: (optional) Auth tuple or callable to enable
Basic/Digest/Custom HTTP Auth.
- :param timeout: (optional) How many seconds to wait for the server to send
+ :param timeout: (optional) How long to wait for the server to send
data before giving up, as a float, or a :ref:`(connect timeout,
read timeout) ` tuple.
:type timeout: float or tuple
@@ -543,8 +543,6 @@ def request(
:type allow_redirects: bool
:param proxies: (optional) Dictionary mapping protocol or protocol and
hostname to the URL of the proxy.
- :param hooks: (optional) Dictionary mapping hook name to one event or
- list of events, event must be callable.
:param stream: (optional) whether to immediately download the response
content. Defaults to ``False``.
:param verify: (optional) Either a boolean, in which case it controls whether we verify
@@ -711,6 +709,7 @@ def send(self, request, **kwargs):
# Persist cookies
if r.history:
+
# If the hooks create history then we want those cookies too
for resp in r.history:
extract_cookies_to_jar(self.cookies, resp.request, resp.raw)
@@ -758,7 +757,7 @@ def merge_environment_settings(self, url, proxies, stream, verify, cert):
# Set environment's proxies.
no_proxy = proxies.get("no_proxy") if proxies is not None else None
env_proxies = get_environ_proxies(url, no_proxy=no_proxy)
- for k, v in env_proxies.items():
+ for (k, v) in env_proxies.items():
proxies.setdefault(k, v)
# Look for requests environment configuration
@@ -784,7 +783,8 @@ def get_adapter(self, url):
:rtype: requests.adapters.BaseAdapter
"""
- for prefix, adapter in self.adapters.items():
+ for (prefix, adapter) in self.adapters.items():
+
if url.lower().startswith(prefix.lower()):
return adapter
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/status_codes.py b/venv1/Lib/site-packages/pip/_vendor/requests/status_codes.py
index c7945a2f..4bd072be 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/status_codes.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/status_codes.py
@@ -24,7 +24,7 @@
# Informational.
100: ("continue",),
101: ("switching_protocols",),
- 102: ("processing", "early-hints"),
+ 102: ("processing",),
103: ("checkpoint",),
122: ("uri_too_long", "request_uri_too_long"),
200: ("ok", "okay", "all_ok", "all_okay", "all_good", "\\o/", "✓"),
@@ -65,8 +65,8 @@
410: ("gone",),
411: ("length_required",),
412: ("precondition_failed", "precondition"),
- 413: ("request_entity_too_large", "content_too_large"),
- 414: ("request_uri_too_large", "uri_too_long"),
+ 413: ("request_entity_too_large",),
+ 414: ("request_uri_too_large",),
415: ("unsupported_media_type", "unsupported_media", "media_type"),
416: (
"requested_range_not_satisfiable",
@@ -76,10 +76,10 @@
417: ("expectation_failed",),
418: ("im_a_teapot", "teapot", "i_am_a_teapot"),
421: ("misdirected_request",),
- 422: ("unprocessable_entity", "unprocessable", "unprocessable_content"),
+ 422: ("unprocessable_entity", "unprocessable"),
423: ("locked",),
424: ("failed_dependency", "dependency"),
- 425: ("unordered_collection", "unordered", "too_early"),
+ 425: ("unordered_collection", "unordered"),
426: ("upgrade_required", "upgrade"),
428: ("precondition_required", "precondition"),
429: ("too_many_requests", "too_many"),
diff --git a/venv1/Lib/site-packages/pip/_vendor/requests/utils.py b/venv1/Lib/site-packages/pip/_vendor/requests/utils.py
index e8ea5ad3..33f394d2 100644
--- a/venv1/Lib/site-packages/pip/_vendor/requests/utils.py
+++ b/venv1/Lib/site-packages/pip/_vendor/requests/utils.py
@@ -25,12 +25,7 @@
from .__version__ import __version__
# to_native_string is unused here, but imported here for backwards compatibility
-from ._internal_utils import ( # noqa: F401
- _HEADER_VALIDATORS_BYTE,
- _HEADER_VALIDATORS_STR,
- HEADER_VALIDATORS,
- to_native_string,
-)
+from ._internal_utils import HEADER_VALIDATORS, to_native_string # noqa: F401
from .compat import (
Mapping,
basestring,
@@ -38,7 +33,6 @@
getproxies,
getproxies_environment,
integer_types,
- is_urllib3_1,
)
from .compat import parse_http_list as _parse_list_header
from .compat import (
@@ -98,8 +92,6 @@ def proxy_bypass_registry(host):
# '' string by the localhost entry and the corresponding
# canonical entry.
proxyOverride = proxyOverride.split(";")
- # filter out empty strings to avoid re.match return true in the following code.
- proxyOverride = filter(None, proxyOverride)
# now check if we match one of the registry values.
for test in proxyOverride:
if test == "":
@@ -137,11 +129,6 @@ def super_len(o):
total_length = None
current_position = 0
- if not is_urllib3_1 and isinstance(o, str):
- # urllib3 2.x+ treats all strings as utf-8 instead
- # of latin-1 (iso-8859-1) like http.client.
- o = o.encode("utf-8")
-
if hasattr(o, "__len__"):
total_length = len(o)
@@ -219,7 +206,14 @@ def get_netrc_auth(url, raise_errors=False):
netrc_path = None
for f in netrc_locations:
- loc = os.path.expanduser(f)
+ try:
+ loc = os.path.expanduser(f)
+ except KeyError:
+ # os.path.expanduser can fail when $HOME is undefined and
+ # getpwuid fails. See https://bugs.python.org/issue20164 &
+ # https://github.com/psf/requests/issues/1846
+ return
+
if os.path.exists(loc):
netrc_path = loc
break
@@ -229,7 +223,13 @@ def get_netrc_auth(url, raise_errors=False):
return
ri = urlparse(url)
- host = ri.hostname
+
+ # Strip port numbers from netloc. This weird `if...encode`` dance is
+ # used for Python 3.2, which doesn't support unicode literals.
+ splitstr = b":"
+ if isinstance(url, str):
+ splitstr = splitstr.decode("ascii")
+ host = ri.netloc.split(splitstr)[0]
try:
_netrc = netrc(netrc_path).authenticators(host)
@@ -461,7 +461,11 @@ def dict_from_cookiejar(cj):
:rtype: dict
"""
- cookie_dict = {cookie.name: cookie.value for cookie in cj}
+ cookie_dict = {}
+
+ for cookie in cj:
+ cookie_dict[cookie.name] = cookie.value
+
return cookie_dict
@@ -758,7 +762,6 @@ def should_bypass_proxies(url, no_proxy):
:rtype: bool
"""
-
# Prioritize lowercase environment variables over uppercase
# to keep a consistent behaviour with other http projects (curl, wget).
def get_proxy(key):
@@ -854,7 +857,7 @@ def select_proxy(url, proxies):
def resolve_proxies(request, proxies, trust_env=True):
"""This method takes proxy information from a request and configuration
input to resolve a mapping of target proxies. This will consider settings
- such as NO_PROXY to strip proxy configurations.
+ such a NO_PROXY to strip proxy configurations.
:param request: Request or PreparedRequest
:param proxies: A dictionary of schemes or schemes and hosts to proxy URLs
@@ -1028,25 +1031,22 @@ def check_header_validity(header):
:param header: tuple, in the format (name, value).
"""
name, value = header
- _validate_header_part(header, name, 0)
- _validate_header_part(header, value, 1)
+ for part in header:
+ if type(part) not in HEADER_VALIDATORS:
+ raise InvalidHeader(
+ f"Header part ({part!r}) from {{{name!r}: {value!r}}} must be "
+ f"of type str or bytes, not {type(part)}"
+ )
+
+ _validate_header_part(name, "name", HEADER_VALIDATORS[type(name)][0])
+ _validate_header_part(value, "value", HEADER_VALIDATORS[type(value)][1])
-def _validate_header_part(header, header_part, header_validator_index):
- if isinstance(header_part, str):
- validator = _HEADER_VALIDATORS_STR[header_validator_index]
- elif isinstance(header_part, bytes):
- validator = _HEADER_VALIDATORS_BYTE[header_validator_index]
- else:
- raise InvalidHeader(
- f"Header part ({header_part!r}) from {header} "
- f"must be of type str or bytes, not {type(header_part)}"
- )
+def _validate_header_part(header_part, header_kind, validator):
if not validator.match(header_part):
- header_kind = "name" if header_validator_index == 0 else "value"
raise InvalidHeader(
- f"Invalid leading whitespace, reserved character(s), or return "
+ f"Invalid leading whitespace, reserved character(s), or return"
f"character(s) in header {header_kind}: {header_part!r}"
)
diff --git a/venv1/Lib/site-packages/pip/_vendor/resolvelib/__init__.py b/venv1/Lib/site-packages/pip/_vendor/resolvelib/__init__.py
index 4c7f815a..d92acc7b 100644
--- a/venv1/Lib/site-packages/pip/_vendor/resolvelib/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/resolvelib/__init__.py
@@ -1,23 +1,22 @@
__all__ = [
+ "__version__",
"AbstractProvider",
"AbstractResolver",
"BaseReporter",
"InconsistentCandidate",
+ "Resolver",
"RequirementsConflicted",
"ResolutionError",
"ResolutionImpossible",
"ResolutionTooDeep",
- "Resolver",
- "__version__",
]
-__version__ = "1.2.1"
+__version__ = "1.0.1"
-from .providers import AbstractProvider
+from .providers import AbstractProvider, AbstractResolver
from .reporters import BaseReporter
from .resolvers import (
- AbstractResolver,
InconsistentCandidate,
RequirementsConflicted,
ResolutionError,
diff --git a/venv1/Lib/site-packages/pip/_vendor/resolvelib/providers.py b/venv1/Lib/site-packages/pip/_vendor/resolvelib/providers.py
index 524e3d83..e99d87ee 100644
--- a/venv1/Lib/site-packages/pip/_vendor/resolvelib/providers.py
+++ b/venv1/Lib/site-packages/pip/_vendor/resolvelib/providers.py
@@ -1,58 +1,30 @@
-from __future__ import annotations
-
-from typing import (
- TYPE_CHECKING,
- Generic,
- Iterable,
- Iterator,
- Mapping,
- Sequence,
-)
-
-from .structs import CT, KT, RT, Matches, RequirementInformation
-
-if TYPE_CHECKING:
- from typing import Any, Protocol
-
- class Preference(Protocol):
- def __lt__(self, __other: Any) -> bool: ...
-
-
-class AbstractProvider(Generic[RT, CT, KT]):
+class AbstractProvider(object):
"""Delegate class to provide the required interface for the resolver."""
- def identify(self, requirement_or_candidate: RT | CT) -> KT:
- """Given a requirement or candidate, return an identifier for it.
+ def identify(self, requirement_or_candidate):
+ """Given a requirement, return an identifier for it.
- This is used to identify, e.g. whether two requirements
- should have their specifier parts merged or a candidate matches a
- requirement via ``find_matches()``.
+ This is used to identify a requirement, e.g. whether two requirements
+ should have their specifier parts merged.
"""
raise NotImplementedError
def get_preference(
self,
- identifier: KT,
- resolutions: Mapping[KT, CT],
- candidates: Mapping[KT, Iterator[CT]],
- information: Mapping[KT, Iterator[RequirementInformation[RT, CT]]],
- backtrack_causes: Sequence[RequirementInformation[RT, CT]],
- ) -> Preference:
+ identifier,
+ resolutions,
+ candidates,
+ information,
+ backtrack_causes,
+ ):
"""Produce a sort key for given requirement based on preference.
- As this is a sort key it will be called O(n) times per backtrack
- step, where n is the number of `identifier`s, if you have a check
- which is expensive in some sense. E.g. It needs to make O(n) checks
- per call or takes significant wall clock time, consider using
- `narrow_requirement_selection` to filter the `identifier`s, which
- is applied before this sort key is called.
-
The preference is defined as "I think this requirement should be
resolved first". The lower the return value is, the more preferred
this group of arguments is.
:param identifier: An identifier as returned by ``identify()``. This
- identifies the requirement being considered.
+ identifies the dependency matches which should be returned.
:param resolutions: Mapping of candidates currently pinned by the
resolver. Each key is an identifier, and the value is a candidate.
The candidate may conflict with requirements from ``information``.
@@ -60,9 +32,8 @@ def get_preference(
Each value is an iterator of candidates.
:param information: Mapping of requirement information of each package.
Each value is an iterator of *requirement information*.
- :param backtrack_causes: Sequence of *requirement information* that are
- the requirements that caused the resolver to most recently
- backtrack.
+ :param backtrack_causes: Sequence of requirement information that were
+ the requirements that caused the resolver to most recently backtrack.
A *requirement information* instance is a named tuple with two members:
@@ -89,21 +60,15 @@ def get_preference(
"""
raise NotImplementedError
- def find_matches(
- self,
- identifier: KT,
- requirements: Mapping[KT, Iterator[RT]],
- incompatibilities: Mapping[KT, Iterator[CT]],
- ) -> Matches[CT]:
+ def find_matches(self, identifier, requirements, incompatibilities):
"""Find all possible candidates that satisfy the given constraints.
- :param identifier: An identifier as returned by ``identify()``. All
- candidates returned by this method should produce the same
- identifier.
+ :param identifier: An identifier as returned by ``identify()``. This
+ identifies the dependency matches of which should be returned.
:param requirements: A mapping of requirements that all returned
candidates must satisfy. Each key is an identifier, and the value
an iterator of requirements for that dependency.
- :param incompatibilities: A mapping of known incompatibile candidates of
+ :param incompatibilities: A mapping of known incompatibilities of
each dependency. Each key is an identifier, and the value an
iterator of incompatibilities known to the resolver. All
incompatibilities *must* be excluded from the return value.
@@ -124,7 +89,7 @@ def find_matches(
"""
raise NotImplementedError
- def is_satisfied_by(self, requirement: RT, candidate: CT) -> bool:
+ def is_satisfied_by(self, requirement, candidate):
"""Whether the given requirement can be satisfied by a candidate.
The candidate is guaranteed to have been generated from the
@@ -135,7 +100,7 @@ def is_satisfied_by(self, requirement: RT, candidate: CT) -> bool:
"""
raise NotImplementedError
- def get_dependencies(self, candidate: CT) -> Iterable[RT]:
+ def get_dependencies(self, candidate):
"""Get dependencies of a candidate.
This should return a collection of requirements that `candidate`
@@ -143,54 +108,26 @@ def get_dependencies(self, candidate: CT) -> Iterable[RT]:
"""
raise NotImplementedError
- def narrow_requirement_selection(
- self,
- identifiers: Iterable[KT],
- resolutions: Mapping[KT, CT],
- candidates: Mapping[KT, Iterator[CT]],
- information: Mapping[KT, Iterator[RequirementInformation[RT, CT]]],
- backtrack_causes: Sequence[RequirementInformation[RT, CT]],
- ) -> Iterable[KT]:
- """
- An optional method to narrow the selection of requirements being
- considered during resolution. This method is called O(1) time per
- backtrack step.
-
- :param identifiers: An iterable of `identifiers` as returned by
- ``identify()``. These identify all requirements currently being
- considered.
- :param resolutions: A mapping of candidates currently pinned by the
- resolver. Each key is an identifier, and the value is a candidate
- that may conflict with requirements from ``information``.
- :param candidates: A mapping of each dependency's possible candidates.
- Each value is an iterator of candidates.
- :param information: A mapping of requirement information for each package.
- Each value is an iterator of *requirement information*.
- :param backtrack_causes: A sequence of *requirement information* that are
- the requirements causing the resolver to most recently
- backtrack.
- A *requirement information* instance is a named tuple with two members:
+class AbstractResolver(object):
+ """The thing that performs the actual resolution work."""
- * ``requirement`` specifies a requirement contributing to the current
- list of candidates.
- * ``parent`` specifies the candidate that provides (is depended on for)
- the requirement, or ``None`` to indicate a root requirement.
-
- Must return a non-empty subset of `identifiers`, with the default
- implementation being to return `identifiers` unchanged. Those `identifiers`
- will then be passed to the sort key `get_preference` to pick the most
- prefered requirement to attempt to pin, unless `narrow_requirement_selection`
- returns only 1 requirement, in which case that will be used without
- calling the sort key `get_preference`.
-
- This method is designed to be used by the provider to optimize the
- dependency resolution, e.g. if a check cost is O(m) and it can be done
- against all identifiers at once then filtering the requirement selection
- here will cost O(m) but making it part of the sort key in `get_preference`
- will cost O(m*n), where n is the number of `identifiers`.
-
- Returns:
- Iterable[KT]: A non-empty subset of `identifiers`.
+ base_exception = Exception
+
+ def __init__(self, provider, reporter):
+ self.provider = provider
+ self.reporter = reporter
+
+ def resolve(self, requirements, **kwargs):
+ """Take a collection of constraints, spit out the resolution result.
+
+ This returns a representation of the final resolution state, with one
+ guarenteed attribute ``mapping`` that contains resolved candidates as
+ values. The keys are their respective identifiers.
+
+ :param requirements: A collection of constraints.
+ :param kwargs: Additional keyword arguments that subclasses may accept.
+
+ :raises: ``self.base_exception`` or its subclass.
"""
- return identifiers
+ raise NotImplementedError
diff --git a/venv1/Lib/site-packages/pip/_vendor/resolvelib/py.typed b/venv1/Lib/site-packages/pip/_vendor/resolvelib/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/venv1/Lib/site-packages/pip/_vendor/resolvelib/reporters.py b/venv1/Lib/site-packages/pip/_vendor/resolvelib/reporters.py
index 6c142204..688b5e10 100644
--- a/venv1/Lib/site-packages/pip/_vendor/resolvelib/reporters.py
+++ b/venv1/Lib/site-packages/pip/_vendor/resolvelib/reporters.py
@@ -1,36 +1,26 @@
-from __future__ import annotations
+class BaseReporter(object):
+ """Delegate class to provider progress reporting for the resolver."""
-from typing import TYPE_CHECKING, Collection, Generic
-
-from .structs import CT, KT, RT, RequirementInformation, State
-
-if TYPE_CHECKING:
- from .resolvers import Criterion
-
-
-class BaseReporter(Generic[RT, CT, KT]):
- """Delegate class to provide progress reporting for the resolver."""
-
- def starting(self) -> None:
+ def starting(self):
"""Called before the resolution actually starts."""
- def starting_round(self, index: int) -> None:
+ def starting_round(self, index):
"""Called before each round of resolution starts.
The index is zero-based.
"""
- def ending_round(self, index: int, state: State[RT, CT, KT]) -> None:
+ def ending_round(self, index, state):
"""Called before each round of resolution ends.
This is NOT called if the resolution ends at this round. Use `ending`
if you want to report finalization. The index is zero-based.
"""
- def ending(self, state: State[RT, CT, KT]) -> None:
+ def ending(self, state):
"""Called before the resolution ends successfully."""
- def adding_requirement(self, requirement: RT, parent: CT | None) -> None:
+ def adding_requirement(self, requirement, parent):
"""Called when adding a new requirement into the resolve criteria.
:param requirement: The additional requirement to be applied to filter
@@ -40,16 +30,14 @@ def adding_requirement(self, requirement: RT, parent: CT | None) -> None:
requirements passed in from ``Resolver.resolve()``.
"""
- def resolving_conflicts(
- self, causes: Collection[RequirementInformation[RT, CT]]
- ) -> None:
+ def resolving_conflicts(self, causes):
"""Called when starting to attempt requirement conflict resolution.
:param causes: The information on the collision that caused the backtracking.
"""
- def rejecting_candidate(self, criterion: Criterion[RT, CT], candidate: CT) -> None:
+ def rejecting_candidate(self, criterion, candidate):
"""Called when rejecting a candidate during backtracking."""
- def pinning(self, candidate: CT) -> None:
+ def pinning(self, candidate):
"""Called when adding a candidate to the potential solution."""
diff --git a/venv1/Lib/site-packages/pip/_vendor/resolvelib/structs.py b/venv1/Lib/site-packages/pip/_vendor/resolvelib/structs.py
index 18c74d41..359a34f6 100644
--- a/venv1/Lib/site-packages/pip/_vendor/resolvelib/structs.py
+++ b/venv1/Lib/site-packages/pip/_vendor/resolvelib/structs.py
@@ -1,73 +1,34 @@
-from __future__ import annotations
-
import itertools
-from collections import namedtuple
-from typing import (
- TYPE_CHECKING,
- Callable,
- Generic,
- Iterable,
- Iterator,
- Mapping,
- NamedTuple,
- Sequence,
- TypeVar,
- Union,
-)
-
-KT = TypeVar("KT") # Identifier.
-RT = TypeVar("RT") # Requirement.
-CT = TypeVar("CT") # Candidate.
-
-Matches = Union[Iterable[CT], Callable[[], Iterable[CT]]]
-
-if TYPE_CHECKING:
- from .resolvers.criterion import Criterion
-
- class RequirementInformation(NamedTuple, Generic[RT, CT]):
- requirement: RT
- parent: CT | None
-
- class State(NamedTuple, Generic[RT, CT, KT]):
- """Resolution state in a round."""
-
- mapping: dict[KT, CT]
- criteria: dict[KT, Criterion[RT, CT]]
- backtrack_causes: list[RequirementInformation[RT, CT]]
-
-else:
- RequirementInformation = namedtuple(
- "RequirementInformation", ["requirement", "parent"]
- )
- State = namedtuple("State", ["mapping", "criteria", "backtrack_causes"])
-
-
-class DirectedGraph(Generic[KT]):
+
+from .compat import collections_abc
+
+
+class DirectedGraph(object):
"""A graph structure with directed edges."""
- def __init__(self) -> None:
- self._vertices: set[KT] = set()
- self._forwards: dict[KT, set[KT]] = {} # -> Set[]
- self._backwards: dict[KT, set[KT]] = {} # -> Set[]
+ def __init__(self):
+ self._vertices = set()
+ self._forwards = {} # -> Set[]
+ self._backwards = {} # -> Set[]
- def __iter__(self) -> Iterator[KT]:
+ def __iter__(self):
return iter(self._vertices)
- def __len__(self) -> int:
+ def __len__(self):
return len(self._vertices)
- def __contains__(self, key: KT) -> bool:
+ def __contains__(self, key):
return key in self._vertices
- def copy(self) -> DirectedGraph[KT]:
+ def copy(self):
"""Return a shallow copy of this graph."""
- other = type(self)()
+ other = DirectedGraph()
other._vertices = set(self._vertices)
other._forwards = {k: set(v) for k, v in self._forwards.items()}
other._backwards = {k: set(v) for k, v in self._backwards.items()}
return other
- def add(self, key: KT) -> None:
+ def add(self, key):
"""Add a new vertex to the graph."""
if key in self._vertices:
raise ValueError("vertex exists")
@@ -75,7 +36,7 @@ def add(self, key: KT) -> None:
self._forwards[key] = set()
self._backwards[key] = set()
- def remove(self, key: KT) -> None:
+ def remove(self, key):
"""Remove a vertex from the graph, disconnecting all edges from/to it."""
self._vertices.remove(key)
for f in self._forwards.pop(key):
@@ -83,10 +44,10 @@ def remove(self, key: KT) -> None:
for t in self._backwards.pop(key):
self._forwards[t].remove(key)
- def connected(self, f: KT, t: KT) -> bool:
+ def connected(self, f, t):
return f in self._backwards[t] and t in self._forwards[f]
- def connect(self, f: KT, t: KT) -> None:
+ def connect(self, f, t):
"""Connect two existing vertices.
Nothing happens if the vertices are already connected.
@@ -96,59 +57,56 @@ def connect(self, f: KT, t: KT) -> None:
self._forwards[f].add(t)
self._backwards[t].add(f)
- def iter_edges(self) -> Iterator[tuple[KT, KT]]:
+ def iter_edges(self):
for f, children in self._forwards.items():
for t in children:
yield f, t
- def iter_children(self, key: KT) -> Iterator[KT]:
+ def iter_children(self, key):
return iter(self._forwards[key])
- def iter_parents(self, key: KT) -> Iterator[KT]:
+ def iter_parents(self, key):
return iter(self._backwards[key])
-class IteratorMapping(Mapping[KT, Iterator[CT]], Generic[RT, CT, KT]):
- def __init__(
- self,
- mapping: Mapping[KT, RT],
- accessor: Callable[[RT], Iterable[CT]],
- appends: Mapping[KT, Iterable[CT]] | None = None,
- ) -> None:
+class IteratorMapping(collections_abc.Mapping):
+ def __init__(self, mapping, accessor, appends=None):
self._mapping = mapping
self._accessor = accessor
- self._appends: Mapping[KT, Iterable[CT]] = appends or {}
+ self._appends = appends or {}
- def __repr__(self) -> str:
+ def __repr__(self):
return "IteratorMapping({!r}, {!r}, {!r})".format(
self._mapping,
self._accessor,
self._appends,
)
- def __bool__(self) -> bool:
+ def __bool__(self):
return bool(self._mapping or self._appends)
- def __contains__(self, key: object) -> bool:
+ __nonzero__ = __bool__ # XXX: Python 2.
+
+ def __contains__(self, key):
return key in self._mapping or key in self._appends
- def __getitem__(self, k: KT) -> Iterator[CT]:
+ def __getitem__(self, k):
try:
v = self._mapping[k]
except KeyError:
return iter(self._appends[k])
return itertools.chain(self._accessor(v), self._appends.get(k, ()))
- def __iter__(self) -> Iterator[KT]:
+ def __iter__(self):
more = (k for k in self._appends if k not in self._mapping)
return itertools.chain(self._mapping, more)
- def __len__(self) -> int:
+ def __len__(self):
more = sum(1 for k in self._appends if k not in self._mapping)
return len(self._mapping) + more
-class _FactoryIterableView(Iterable[RT]):
+class _FactoryIterableView(object):
"""Wrap an iterator factory returned by `find_matches()`.
Calling `iter()` on this class would invoke the underlying iterator
@@ -157,53 +115,56 @@ class _FactoryIterableView(Iterable[RT]):
built-in Python sequence types.
"""
- def __init__(self, factory: Callable[[], Iterable[RT]]) -> None:
+ def __init__(self, factory):
self._factory = factory
- self._iterable: Iterable[RT] | None = None
+ self._iterable = None
- def __repr__(self) -> str:
- return f"{type(self).__name__}({list(self)})"
+ def __repr__(self):
+ return "{}({})".format(type(self).__name__, list(self))
- def __bool__(self) -> bool:
+ def __bool__(self):
try:
next(iter(self))
except StopIteration:
return False
return True
- def __iter__(self) -> Iterator[RT]:
- iterable = self._factory() if self._iterable is None else self._iterable
+ __nonzero__ = __bool__ # XXX: Python 2.
+
+ def __iter__(self):
+ iterable = (
+ self._factory() if self._iterable is None else self._iterable
+ )
self._iterable, current = itertools.tee(iterable)
return current
-class _SequenceIterableView(Iterable[RT]):
+class _SequenceIterableView(object):
"""Wrap an iterable returned by find_matches().
This is essentially just a proxy to the underlying sequence that provides
the same interface as `_FactoryIterableView`.
"""
- def __init__(self, sequence: Sequence[RT]):
+ def __init__(self, sequence):
self._sequence = sequence
- def __repr__(self) -> str:
- return f"{type(self).__name__}({self._sequence})"
+ def __repr__(self):
+ return "{}({})".format(type(self).__name__, self._sequence)
- def __bool__(self) -> bool:
+ def __bool__(self):
return bool(self._sequence)
- def __iter__(self) -> Iterator[RT]:
+ __nonzero__ = __bool__ # XXX: Python 2.
+
+ def __iter__(self):
return iter(self._sequence)
-def build_iter_view(matches: Matches[CT]) -> Iterable[CT]:
+def build_iter_view(matches):
"""Build an iterable view from the value returned by `find_matches()`."""
if callable(matches):
return _FactoryIterableView(matches)
- if not isinstance(matches, Sequence):
+ if not isinstance(matches, collections_abc.Sequence):
matches = list(matches)
return _SequenceIterableView(matches)
-
-
-IterableView = Iterable
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/__main__.py b/venv1/Lib/site-packages/pip/_vendor/rich/__main__.py
index a583f1ef..270629fd 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/__main__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/__main__.py
@@ -207,7 +207,6 @@ def iter_last(values: Iterable[T]) -> Iterable[Tuple[bool, T]]:
if __name__ == "__main__": # pragma: no cover
- from pip._vendor.rich.panel import Panel
console = Console(
file=io.StringIO(),
@@ -229,17 +228,47 @@ def iter_last(values: Iterable[T]) -> Iterable[Tuple[bool, T]]:
c = Console(record=True)
c.print(test_card)
+ print(f"rendered in {pre_cache_taken}ms (cold cache)")
+ print(f"rendered in {taken}ms (warm cache)")
+
+ from pip._vendor.rich.panel import Panel
+
console = Console()
- console.print(f"[dim]rendered in [not dim]{pre_cache_taken}ms[/] (cold cache)")
- console.print(f"[dim]rendered in [not dim]{taken}ms[/] (warm cache)")
- console.print()
+
+ sponsor_message = Table.grid(padding=1)
+ sponsor_message.add_column(style="green", justify="right")
+ sponsor_message.add_column(no_wrap=True)
+
+ sponsor_message.add_row(
+ "Textualize",
+ "[u blue link=https://github.com/textualize]https://github.com/textualize",
+ )
+ sponsor_message.add_row(
+ "Twitter",
+ "[u blue link=https://twitter.com/willmcgugan]https://twitter.com/willmcgugan",
+ )
+
+ intro_message = Text.from_markup(
+ """\
+We hope you enjoy using Rich!
+
+Rich is maintained with [red]:heart:[/] by [link=https://www.textualize.io]Textualize.io[/]
+
+- Will McGugan"""
+ )
+
+ message = Table.grid(padding=2)
+ message.add_column()
+ message.add_column(no_wrap=True)
+ message.add_row(intro_message, sponsor_message)
+
console.print(
Panel.fit(
- "[b magenta]Hope you enjoy using Rich![/]\n\n"
- "Please consider sponsoring me if you get value from my work.\n\n"
- "Even the price of a ☕ can brighten my day!\n\n"
- "https://github.com/sponsors/willmcgugan",
- border_style="red",
- title="Help ensure Rich is maintained",
- )
+ message,
+ box=box.ROUNDED,
+ padding=(1, 2),
+ title="[b red]Thanks for trying out Rich!",
+ border_style="bright_blue",
+ ),
+ justify="center",
)
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/_cell_widths.py b/venv1/Lib/site-packages/pip/_vendor/rich/_cell_widths.py
index 608ae3a7..36286df3 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/_cell_widths.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/_cell_widths.py
@@ -4,7 +4,6 @@
(0, 0, 0),
(1, 31, -1),
(127, 159, -1),
- (173, 173, 0),
(768, 879, 0),
(1155, 1161, 0),
(1425, 1469, 0),
@@ -12,16 +11,13 @@
(1473, 1474, 0),
(1476, 1477, 0),
(1479, 1479, 0),
- (1536, 1541, 0),
(1552, 1562, 0),
- (1564, 1564, 0),
(1611, 1631, 0),
(1648, 1648, 0),
- (1750, 1757, 0),
+ (1750, 1756, 0),
(1759, 1764, 0),
(1767, 1768, 0),
(1770, 1773, 0),
- (1807, 1807, 0),
(1809, 1809, 0),
(1840, 1866, 0),
(1958, 1968, 0),
@@ -32,137 +28,149 @@
(2085, 2087, 0),
(2089, 2093, 0),
(2137, 2139, 0),
- (2192, 2193, 0),
- (2200, 2207, 0),
- (2250, 2307, 0),
- (2362, 2364, 0),
- (2366, 2383, 0),
+ (2259, 2273, 0),
+ (2275, 2306, 0),
+ (2362, 2362, 0),
+ (2364, 2364, 0),
+ (2369, 2376, 0),
+ (2381, 2381, 0),
(2385, 2391, 0),
(2402, 2403, 0),
- (2433, 2435, 0),
+ (2433, 2433, 0),
(2492, 2492, 0),
- (2494, 2500, 0),
- (2503, 2504, 0),
- (2507, 2509, 0),
- (2519, 2519, 0),
+ (2497, 2500, 0),
+ (2509, 2509, 0),
(2530, 2531, 0),
(2558, 2558, 0),
- (2561, 2563, 0),
+ (2561, 2562, 0),
(2620, 2620, 0),
- (2622, 2626, 0),
+ (2625, 2626, 0),
(2631, 2632, 0),
(2635, 2637, 0),
(2641, 2641, 0),
(2672, 2673, 0),
(2677, 2677, 0),
- (2689, 2691, 0),
+ (2689, 2690, 0),
(2748, 2748, 0),
- (2750, 2757, 0),
- (2759, 2761, 0),
- (2763, 2765, 0),
+ (2753, 2757, 0),
+ (2759, 2760, 0),
+ (2765, 2765, 0),
(2786, 2787, 0),
(2810, 2815, 0),
- (2817, 2819, 0),
+ (2817, 2817, 0),
(2876, 2876, 0),
- (2878, 2884, 0),
- (2887, 2888, 0),
- (2891, 2893, 0),
- (2901, 2903, 0),
+ (2879, 2879, 0),
+ (2881, 2884, 0),
+ (2893, 2893, 0),
+ (2901, 2902, 0),
(2914, 2915, 0),
(2946, 2946, 0),
- (3006, 3010, 0),
- (3014, 3016, 0),
- (3018, 3021, 0),
- (3031, 3031, 0),
- (3072, 3076, 0),
- (3132, 3132, 0),
- (3134, 3140, 0),
+ (3008, 3008, 0),
+ (3021, 3021, 0),
+ (3072, 3072, 0),
+ (3076, 3076, 0),
+ (3134, 3136, 0),
(3142, 3144, 0),
(3146, 3149, 0),
(3157, 3158, 0),
(3170, 3171, 0),
- (3201, 3203, 0),
+ (3201, 3201, 0),
(3260, 3260, 0),
- (3262, 3268, 0),
- (3270, 3272, 0),
- (3274, 3277, 0),
- (3285, 3286, 0),
+ (3263, 3263, 0),
+ (3270, 3270, 0),
+ (3276, 3277, 0),
(3298, 3299, 0),
- (3315, 3315, 0),
- (3328, 3331, 0),
+ (3328, 3329, 0),
(3387, 3388, 0),
- (3390, 3396, 0),
- (3398, 3400, 0),
- (3402, 3405, 0),
- (3415, 3415, 0),
+ (3393, 3396, 0),
+ (3405, 3405, 0),
(3426, 3427, 0),
- (3457, 3459, 0),
+ (3457, 3457, 0),
(3530, 3530, 0),
- (3535, 3540, 0),
+ (3538, 3540, 0),
(3542, 3542, 0),
- (3544, 3551, 0),
- (3570, 3571, 0),
(3633, 3633, 0),
(3636, 3642, 0),
(3655, 3662, 0),
(3761, 3761, 0),
(3764, 3772, 0),
- (3784, 3790, 0),
+ (3784, 3789, 0),
(3864, 3865, 0),
(3893, 3893, 0),
(3895, 3895, 0),
(3897, 3897, 0),
- (3902, 3903, 0),
- (3953, 3972, 0),
+ (3953, 3966, 0),
+ (3968, 3972, 0),
(3974, 3975, 0),
(3981, 3991, 0),
(3993, 4028, 0),
(4038, 4038, 0),
- (4139, 4158, 0),
- (4182, 4185, 0),
+ (4141, 4144, 0),
+ (4146, 4151, 0),
+ (4153, 4154, 0),
+ (4157, 4158, 0),
+ (4184, 4185, 0),
(4190, 4192, 0),
- (4194, 4196, 0),
- (4199, 4205, 0),
(4209, 4212, 0),
- (4226, 4237, 0),
- (4239, 4239, 0),
- (4250, 4253, 0),
+ (4226, 4226, 0),
+ (4229, 4230, 0),
+ (4237, 4237, 0),
+ (4253, 4253, 0),
(4352, 4447, 2),
- (4448, 4607, 0),
(4957, 4959, 0),
- (5906, 5909, 0),
+ (5906, 5908, 0),
(5938, 5940, 0),
(5970, 5971, 0),
(6002, 6003, 0),
- (6068, 6099, 0),
+ (6068, 6069, 0),
+ (6071, 6077, 0),
+ (6086, 6086, 0),
+ (6089, 6099, 0),
(6109, 6109, 0),
- (6155, 6159, 0),
+ (6155, 6157, 0),
(6277, 6278, 0),
(6313, 6313, 0),
- (6432, 6443, 0),
- (6448, 6459, 0),
- (6679, 6683, 0),
- (6741, 6750, 0),
- (6752, 6780, 0),
+ (6432, 6434, 0),
+ (6439, 6440, 0),
+ (6450, 6450, 0),
+ (6457, 6459, 0),
+ (6679, 6680, 0),
+ (6683, 6683, 0),
+ (6742, 6742, 0),
+ (6744, 6750, 0),
+ (6752, 6752, 0),
+ (6754, 6754, 0),
+ (6757, 6764, 0),
+ (6771, 6780, 0),
(6783, 6783, 0),
- (6832, 6862, 0),
- (6912, 6916, 0),
- (6964, 6980, 0),
+ (6832, 6848, 0),
+ (6912, 6915, 0),
+ (6964, 6964, 0),
+ (6966, 6970, 0),
+ (6972, 6972, 0),
+ (6978, 6978, 0),
(7019, 7027, 0),
- (7040, 7042, 0),
- (7073, 7085, 0),
- (7142, 7155, 0),
- (7204, 7223, 0),
+ (7040, 7041, 0),
+ (7074, 7077, 0),
+ (7080, 7081, 0),
+ (7083, 7085, 0),
+ (7142, 7142, 0),
+ (7144, 7145, 0),
+ (7149, 7149, 0),
+ (7151, 7153, 0),
+ (7212, 7219, 0),
+ (7222, 7223, 0),
(7376, 7378, 0),
- (7380, 7400, 0),
+ (7380, 7392, 0),
+ (7394, 7400, 0),
(7405, 7405, 0),
(7412, 7412, 0),
- (7415, 7417, 0),
- (7616, 7679, 0),
+ (7416, 7417, 0),
+ (7616, 7673, 0),
+ (7675, 7679, 0),
(8203, 8207, 0),
(8232, 8238, 0),
- (8288, 8292, 0),
- (8294, 8303, 0),
+ (8288, 8291, 0),
(8400, 8432, 0),
(8986, 8987, 2),
(9001, 9002, 2),
@@ -204,16 +212,17 @@
(11904, 11929, 2),
(11931, 12019, 2),
(12032, 12245, 2),
- (12272, 12329, 2),
- (12330, 12335, 0),
- (12336, 12350, 2),
+ (12272, 12283, 2),
+ (12288, 12329, 2),
+ (12330, 12333, 0),
+ (12334, 12350, 2),
(12353, 12438, 2),
(12441, 12442, 0),
(12443, 12543, 2),
(12549, 12591, 2),
(12593, 12686, 2),
(12688, 12771, 2),
- (12783, 12830, 2),
+ (12784, 12830, 2),
(12832, 12871, 2),
(12880, 19903, 2),
(19968, 42124, 2),
@@ -225,33 +234,36 @@
(43010, 43010, 0),
(43014, 43014, 0),
(43019, 43019, 0),
- (43043, 43047, 0),
+ (43045, 43046, 0),
(43052, 43052, 0),
- (43136, 43137, 0),
- (43188, 43205, 0),
+ (43204, 43205, 0),
(43232, 43249, 0),
(43263, 43263, 0),
(43302, 43309, 0),
- (43335, 43347, 0),
+ (43335, 43345, 0),
(43360, 43388, 2),
- (43392, 43395, 0),
- (43443, 43456, 0),
+ (43392, 43394, 0),
+ (43443, 43443, 0),
+ (43446, 43449, 0),
+ (43452, 43453, 0),
(43493, 43493, 0),
- (43561, 43574, 0),
+ (43561, 43566, 0),
+ (43569, 43570, 0),
+ (43573, 43574, 0),
(43587, 43587, 0),
- (43596, 43597, 0),
- (43643, 43645, 0),
+ (43596, 43596, 0),
+ (43644, 43644, 0),
(43696, 43696, 0),
(43698, 43700, 0),
(43703, 43704, 0),
(43710, 43711, 0),
(43713, 43713, 0),
- (43755, 43759, 0),
- (43765, 43766, 0),
- (44003, 44010, 0),
- (44012, 44013, 0),
+ (43756, 43757, 0),
+ (43766, 43766, 0),
+ (44005, 44005, 0),
+ (44008, 44008, 0),
+ (44013, 44013, 0),
(44032, 55203, 2),
- (55216, 55295, 0),
(63744, 64255, 2),
(64286, 64286, 0),
(65024, 65039, 0),
@@ -260,10 +272,8 @@
(65072, 65106, 2),
(65108, 65126, 2),
(65128, 65131, 2),
- (65279, 65279, 0),
(65281, 65376, 2),
(65504, 65510, 2),
- (65529, 65531, 0),
(66045, 66045, 0),
(66272, 66272, 0),
(66422, 66426, 0),
@@ -275,108 +285,102 @@
(68325, 68326, 0),
(68900, 68903, 0),
(69291, 69292, 0),
- (69373, 69375, 0),
(69446, 69456, 0),
- (69506, 69509, 0),
- (69632, 69634, 0),
+ (69633, 69633, 0),
(69688, 69702, 0),
- (69744, 69744, 0),
- (69747, 69748, 0),
- (69759, 69762, 0),
- (69808, 69818, 0),
- (69821, 69821, 0),
- (69826, 69826, 0),
- (69837, 69837, 0),
+ (69759, 69761, 0),
+ (69811, 69814, 0),
+ (69817, 69818, 0),
(69888, 69890, 0),
- (69927, 69940, 0),
- (69957, 69958, 0),
+ (69927, 69931, 0),
+ (69933, 69940, 0),
(70003, 70003, 0),
- (70016, 70018, 0),
- (70067, 70080, 0),
+ (70016, 70017, 0),
+ (70070, 70078, 0),
(70089, 70092, 0),
- (70094, 70095, 0),
- (70188, 70199, 0),
+ (70095, 70095, 0),
+ (70191, 70193, 0),
+ (70196, 70196, 0),
+ (70198, 70199, 0),
(70206, 70206, 0),
- (70209, 70209, 0),
- (70367, 70378, 0),
- (70400, 70403, 0),
+ (70367, 70367, 0),
+ (70371, 70378, 0),
+ (70400, 70401, 0),
(70459, 70460, 0),
- (70462, 70468, 0),
- (70471, 70472, 0),
- (70475, 70477, 0),
- (70487, 70487, 0),
- (70498, 70499, 0),
+ (70464, 70464, 0),
(70502, 70508, 0),
(70512, 70516, 0),
- (70709, 70726, 0),
+ (70712, 70719, 0),
+ (70722, 70724, 0),
+ (70726, 70726, 0),
(70750, 70750, 0),
- (70832, 70851, 0),
- (71087, 71093, 0),
- (71096, 71104, 0),
+ (70835, 70840, 0),
+ (70842, 70842, 0),
+ (70847, 70848, 0),
+ (70850, 70851, 0),
+ (71090, 71093, 0),
+ (71100, 71101, 0),
+ (71103, 71104, 0),
(71132, 71133, 0),
- (71216, 71232, 0),
- (71339, 71351, 0),
- (71453, 71467, 0),
- (71724, 71738, 0),
- (71984, 71989, 0),
- (71991, 71992, 0),
- (71995, 71998, 0),
- (72000, 72000, 0),
- (72002, 72003, 0),
- (72145, 72151, 0),
- (72154, 72160, 0),
- (72164, 72164, 0),
+ (71219, 71226, 0),
+ (71229, 71229, 0),
+ (71231, 71232, 0),
+ (71339, 71339, 0),
+ (71341, 71341, 0),
+ (71344, 71349, 0),
+ (71351, 71351, 0),
+ (71453, 71455, 0),
+ (71458, 71461, 0),
+ (71463, 71467, 0),
+ (71727, 71735, 0),
+ (71737, 71738, 0),
+ (71995, 71996, 0),
+ (71998, 71998, 0),
+ (72003, 72003, 0),
+ (72148, 72151, 0),
+ (72154, 72155, 0),
+ (72160, 72160, 0),
(72193, 72202, 0),
- (72243, 72249, 0),
+ (72243, 72248, 0),
(72251, 72254, 0),
(72263, 72263, 0),
- (72273, 72283, 0),
- (72330, 72345, 0),
- (72751, 72758, 0),
- (72760, 72767, 0),
+ (72273, 72278, 0),
+ (72281, 72283, 0),
+ (72330, 72342, 0),
+ (72344, 72345, 0),
+ (72752, 72758, 0),
+ (72760, 72765, 0),
+ (72767, 72767, 0),
(72850, 72871, 0),
- (72873, 72886, 0),
+ (72874, 72880, 0),
+ (72882, 72883, 0),
+ (72885, 72886, 0),
(73009, 73014, 0),
(73018, 73018, 0),
(73020, 73021, 0),
(73023, 73029, 0),
(73031, 73031, 0),
- (73098, 73102, 0),
(73104, 73105, 0),
- (73107, 73111, 0),
- (73459, 73462, 0),
- (73472, 73473, 0),
- (73475, 73475, 0),
- (73524, 73530, 0),
- (73534, 73538, 0),
- (78896, 78912, 0),
- (78919, 78933, 0),
+ (73109, 73109, 0),
+ (73111, 73111, 0),
+ (73459, 73460, 0),
(92912, 92916, 0),
(92976, 92982, 0),
(94031, 94031, 0),
- (94033, 94087, 0),
(94095, 94098, 0),
(94176, 94179, 2),
(94180, 94180, 0),
- (94192, 94193, 0),
+ (94192, 94193, 2),
(94208, 100343, 2),
(100352, 101589, 2),
(101632, 101640, 2),
- (110576, 110579, 2),
- (110581, 110587, 2),
- (110589, 110590, 2),
- (110592, 110882, 2),
- (110898, 110898, 2),
+ (110592, 110878, 2),
(110928, 110930, 2),
- (110933, 110933, 2),
(110948, 110951, 2),
(110960, 111355, 2),
(113821, 113822, 0),
- (113824, 113827, 0),
- (118528, 118573, 0),
- (118576, 118598, 0),
- (119141, 119145, 0),
- (119149, 119170, 0),
+ (119143, 119145, 0),
+ (119163, 119170, 0),
(119173, 119179, 0),
(119210, 119213, 0),
(119362, 119364, 0),
@@ -391,11 +395,8 @@
(122907, 122913, 0),
(122915, 122916, 0),
(122918, 122922, 0),
- (123023, 123023, 0),
(123184, 123190, 0),
- (123566, 123566, 0),
(123628, 123631, 0),
- (124140, 124143, 0),
(125136, 125142, 0),
(125252, 125258, 0),
(126980, 126980, 2),
@@ -415,9 +416,7 @@
(127951, 127955, 2),
(127968, 127984, 2),
(127988, 127988, 2),
- (127992, 127994, 2),
- (127995, 127999, 0),
- (128000, 128062, 2),
+ (127992, 128062, 2),
(128064, 128064, 2),
(128066, 128252, 2),
(128255, 128317, 2),
@@ -431,24 +430,22 @@
(128716, 128716, 2),
(128720, 128722, 2),
(128725, 128727, 2),
- (128732, 128735, 2),
(128747, 128748, 2),
(128756, 128764, 2),
(128992, 129003, 2),
- (129008, 129008, 2),
(129292, 129338, 2),
(129340, 129349, 2),
- (129351, 129535, 2),
- (129648, 129660, 2),
- (129664, 129672, 2),
- (129680, 129725, 2),
- (129727, 129733, 2),
- (129742, 129755, 2),
- (129760, 129768, 2),
- (129776, 129784, 2),
+ (129351, 129400, 2),
+ (129402, 129483, 2),
+ (129485, 129535, 2),
+ (129648, 129652, 2),
+ (129656, 129658, 2),
+ (129664, 129670, 2),
+ (129680, 129704, 2),
+ (129712, 129718, 2),
+ (129728, 129730, 2),
+ (129744, 129750, 2),
(131072, 196605, 2),
(196608, 262141, 2),
- (917505, 917505, 0),
- (917536, 917631, 0),
(917760, 917999, 0),
]
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/_export_format.py b/venv1/Lib/site-packages/pip/_vendor/rich/_export_format.py
index e7527e52..094d2dc2 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/_export_format.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/_export_format.py
@@ -1,6 +1,5 @@
CONSOLE_HTML_FORMAT = """\
-
+
- {code}
+ {code}
"""
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/_inspect.py b/venv1/Lib/site-packages/pip/_vendor/rich/_inspect.py
index 27d65cec..30446ceb 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/_inspect.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/_inspect.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
import inspect
from inspect import cleandoc, getdoc, getfile, isclass, ismodule, signature
from typing import Any, Collection, Iterable, Optional, Tuple, Type, Union
@@ -214,7 +216,7 @@ def safe_getattr(attr_name: str) -> Tuple[Any, Any]:
def _get_formatted_doc(self, object_: Any) -> Optional[str]:
"""
Extract the docstring of an object, process it and returns it.
- The processing consists in cleaning up the docstring's indentation,
+ The processing consists in cleaning up the doctring's indentation,
taking only its 1st paragraph if `self.help` is not True,
and escape its control codes.
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/_null_file.py b/venv1/Lib/site-packages/pip/_vendor/rich/_null_file.py
index 6ae05d3e..b659673e 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/_null_file.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/_null_file.py
@@ -46,7 +46,7 @@ def __iter__(self) -> Iterator[str]:
return iter([""])
def __enter__(self) -> IO[str]:
- return self
+ pass
def __exit__(
self,
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/_ratio.py b/venv1/Lib/site-packages/pip/_vendor/rich/_ratio.py
index 5fd5a383..e8a3a674 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/_ratio.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/_ratio.py
@@ -1,6 +1,12 @@
+import sys
from fractions import Fraction
from math import ceil
-from typing import cast, List, Optional, Sequence, Protocol
+from typing import cast, List, Optional, Sequence
+
+if sys.version_info >= (3, 8):
+ from typing import Protocol
+else:
+ from pip._vendor.typing_extensions import Protocol # pragma: no cover
class Edge(Protocol):
@@ -145,6 +151,7 @@ def ratio_distribute(
@dataclass
class E:
+
size: Optional[int] = None
ratio: int = 1
minimum_size: int = 1
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/_win32_console.py b/venv1/Lib/site-packages/pip/_vendor/rich/_win32_console.py
index 2eba1b9b..81b10829 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/_win32_console.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/_win32_console.py
@@ -2,7 +2,6 @@
The API that this module wraps is documented at https://docs.microsoft.com/en-us/windows/console/console-functions
"""
-
import ctypes
import sys
from typing import Any
@@ -381,7 +380,7 @@ def cursor_position(self) -> WindowsCoordinates:
WindowsCoordinates: The current cursor position.
"""
coord: COORD = GetConsoleScreenBufferInfo(self._handle).dwCursorPosition
- return WindowsCoordinates(row=coord.Y, col=coord.X)
+ return WindowsCoordinates(row=cast(int, coord.Y), col=cast(int, coord.X))
@property
def screen_size(self) -> WindowsCoordinates:
@@ -391,7 +390,9 @@ def screen_size(self) -> WindowsCoordinates:
WindowsCoordinates: The width and height of the screen as WindowsCoordinates.
"""
screen_size: COORD = GetConsoleScreenBufferInfo(self._handle).dwSize
- return WindowsCoordinates(row=screen_size.Y, col=screen_size.X)
+ return WindowsCoordinates(
+ row=cast(int, screen_size.Y), col=cast(int, screen_size.X)
+ )
def write_text(self, text: str) -> None:
"""Write text directly to the terminal without any modification of styles
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/_windows.py b/venv1/Lib/site-packages/pip/_vendor/rich/_windows.py
index 7520a9f9..10fc0d7e 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/_windows.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/_windows.py
@@ -30,6 +30,7 @@ class WindowsConsoleFeatures:
)
except (AttributeError, ImportError, ValueError):
+
# Fallback if we can't load the Windows DLL
def get_windows_console_features() -> WindowsConsoleFeatures:
features = WindowsConsoleFeatures()
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/_wrap.py b/venv1/Lib/site-packages/pip/_vendor/rich/_wrap.py
index 2e94ff6f..c45f193f 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/_wrap.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/_wrap.py
@@ -1,7 +1,5 @@
-from __future__ import annotations
-
import re
-from typing import Iterable
+from typing import Iterable, List, Tuple
from ._loop import loop_last
from .cells import cell_len, chop_cells
@@ -9,11 +7,7 @@
re_word = re.compile(r"\s*\S+\s*")
-def words(text: str) -> Iterable[tuple[int, int, str]]:
- """Yields each word from the text as a tuple
- containing (start_index, end_index, word). A "word" in this context may
- include the actual word and any whitespace to the right.
- """
+def words(text: str) -> Iterable[Tuple[int, int, str]]:
position = 0
word_match = re_word.match(text, position)
while word_match is not None:
@@ -23,59 +17,35 @@ def words(text: str) -> Iterable[tuple[int, int, str]]:
word_match = re_word.match(text, end)
-def divide_line(text: str, width: int, fold: bool = True) -> list[int]:
- """Given a string of text, and a width (measured in cells), return a list
- of cell offsets which the string should be split at in order for it to fit
- within the given width.
-
- Args:
- text: The text to examine.
- width: The available cell width.
- fold: If True, words longer than `width` will be folded onto a new line.
-
- Returns:
- A list of indices to break the line at.
- """
- break_positions: list[int] = [] # offsets to insert the breaks at
- append = break_positions.append
- cell_offset = 0
+def divide_line(text: str, width: int, fold: bool = True) -> List[int]:
+ divides: List[int] = []
+ append = divides.append
+ line_position = 0
_cell_len = cell_len
-
for start, _end, word in words(text):
word_length = _cell_len(word.rstrip())
- remaining_space = width - cell_offset
- word_fits_remaining_space = remaining_space >= word_length
-
- if word_fits_remaining_space:
- # Simplest case - the word fits within the remaining width for this line.
- cell_offset += _cell_len(word)
- else:
- # Not enough space remaining for this word on the current line.
+ if line_position + word_length > width:
if word_length > width:
- # The word doesn't fit on any line, so we can't simply
- # place it on the next line...
if fold:
- # Fold the word across multiple lines.
- folded_word = chop_cells(word, width=width)
- for last, line in loop_last(folded_word):
+ chopped_words = chop_cells(word, max_size=width, position=0)
+ for last, line in loop_last(chopped_words):
if start:
append(start)
+
if last:
- cell_offset = _cell_len(line)
+ line_position = _cell_len(line)
else:
start += len(line)
else:
- # Folding isn't allowed, so crop the word.
if start:
append(start)
- cell_offset = _cell_len(word)
- elif cell_offset and start:
- # The word doesn't fit within the remaining space on the current
- # line, but it *can* fit on to the next (empty) line.
+ line_position = _cell_len(word)
+ elif line_position and start:
append(start)
- cell_offset = _cell_len(word)
-
- return break_positions
+ line_position = _cell_len(word)
+ else:
+ line_position += _cell_len(word)
+ return divides
if __name__ == "__main__": # pragma: no cover
@@ -83,11 +53,4 @@ def divide_line(text: str, width: int, fold: bool = True) -> list[int]:
console = Console(width=10)
console.print("12345 abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ 12345")
- print(chop_cells("abcdefghijklmnopqrstuvwxyz", 10))
-
- console = Console(width=20)
- console.rule()
- console.print("TextualはPythonの高速アプリケーション開発フレームワークです")
-
- console.rule()
- console.print("アプリケーションは1670万色を使用でき")
+ print(chop_cells("abcdefghijklmnopqrstuvwxyz", 10, position=2))
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/align.py b/venv1/Lib/site-packages/pip/_vendor/rich/align.py
index e65dc5ba..c310b66e 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/align.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/align.py
@@ -1,5 +1,11 @@
+import sys
from itertools import chain
-from typing import TYPE_CHECKING, Iterable, Optional, Literal
+from typing import TYPE_CHECKING, Iterable, Optional
+
+if sys.version_info >= (3, 8):
+ from typing import Literal
+else:
+ from pip._vendor.typing_extensions import Literal # pragma: no cover
from .constrain import Constrain
from .jupyter import JupyterMixin
@@ -21,7 +27,7 @@ class Align(JupyterMixin):
renderable (RenderableType): A console renderable.
align (AlignMethod): One of "left", "center", or "right""
style (StyleType, optional): An optional style to apply to the background.
- vertical (Optional[VerticalAlignMethod], optional): Optional vertical align, one of "top", "middle", or "bottom". Defaults to None.
+ vertical (Optional[VerticalAlginMethod], optional): Optional vertical align, one of "top", "middle", or "bottom". Defaults to None.
pad (bool, optional): Pad the right with spaces. Defaults to True.
width (int, optional): Restrict contents to given width, or None to use default width. Defaults to None.
height (int, optional): Set height of align renderable, or None to fit to contents. Defaults to None.
@@ -234,7 +240,6 @@ class VerticalCenter(JupyterMixin):
Args:
renderable (RenderableType): A renderable object.
- style (StyleType, optional): An optional style to apply to the background. Defaults to None.
"""
def __init__(
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/ansi.py b/venv1/Lib/site-packages/pip/_vendor/rich/ansi.py
index 7de86ce5..66365e65 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/ansi.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/ansi.py
@@ -9,7 +9,6 @@
re_ansi = re.compile(
r"""
-(?:\x1b[0-?])|
(?:\x1b\](.*?)\x1b\\)|
(?:\x1b([(@-Z\\-_]|\[[0-?]*[ -/]*[@-~]))
""",
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/bar.py b/venv1/Lib/site-packages/pip/_vendor/rich/bar.py
index 022284b5..ed86a552 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/bar.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/bar.py
@@ -48,6 +48,7 @@ def __repr__(self) -> str:
def __rich_console__(
self, console: Console, options: ConsoleOptions
) -> RenderResult:
+
width = min(
self.width if self.width is not None else options.max_width,
options.max_width,
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/box.py b/venv1/Lib/site-packages/pip/_vendor/rich/box.py
index 3f330ccb..97d2a944 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/box.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/box.py
@@ -1,4 +1,10 @@
-from typing import TYPE_CHECKING, Iterable, List, Literal
+import sys
+from typing import TYPE_CHECKING, Iterable, List
+
+if sys.version_info >= (3, 8):
+ from typing import Literal
+else:
+ from pip._vendor.typing_extensions import Literal # pragma: no cover
from ._loop import loop_last
@@ -182,224 +188,260 @@ def get_bottom(self, widths: Iterable[int]) -> str:
return "".join(parts)
-# fmt: off
ASCII: Box = Box(
- "+--+\n"
- "| ||\n"
- "|-+|\n"
- "| ||\n"
- "|-+|\n"
- "|-+|\n"
- "| ||\n"
- "+--+\n",
+ """\
++--+
+| ||
+|-+|
+| ||
+|-+|
+|-+|
+| ||
++--+
+""",
ascii=True,
)
ASCII2: Box = Box(
- "+-++\n"
- "| ||\n"
- "+-++\n"
- "| ||\n"
- "+-++\n"
- "+-++\n"
- "| ||\n"
- "+-++\n",
+ """\
++-++
+| ||
++-++
+| ||
++-++
++-++
+| ||
++-++
+""",
ascii=True,
)
ASCII_DOUBLE_HEAD: Box = Box(
- "+-++\n"
- "| ||\n"
- "+=++\n"
- "| ||\n"
- "+-++\n"
- "+-++\n"
- "| ||\n"
- "+-++\n",
+ """\
++-++
+| ||
++=++
+| ||
++-++
++-++
+| ||
++-++
+""",
ascii=True,
)
SQUARE: Box = Box(
- "┌─┬┐\n"
- "│ ││\n"
- "├─┼┤\n"
- "│ ││\n"
- "├─┼┤\n"
- "├─┼┤\n"
- "│ ││\n"
- "└─┴┘\n"
+ """\
+┌─┬┐
+│ ││
+├─┼┤
+│ ││
+├─┼┤
+├─┼┤
+│ ││
+└─┴┘
+"""
)
SQUARE_DOUBLE_HEAD: Box = Box(
- "┌─┬┐\n"
- "│ ││\n"
- "╞═╪╡\n"
- "│ ││\n"
- "├─┼┤\n"
- "├─┼┤\n"
- "│ ││\n"
- "└─┴┘\n"
+ """\
+┌─┬┐
+│ ││
+╞═╪╡
+│ ││
+├─┼┤
+├─┼┤
+│ ││
+└─┴┘
+"""
)
MINIMAL: Box = Box(
- " ╷ \n"
- " │ \n"
- "╶─┼╴\n"
- " │ \n"
- "╶─┼╴\n"
- "╶─┼╴\n"
- " │ \n"
- " ╵ \n"
+ """\
+ ╷
+ │
+╶─┼╴
+ │
+╶─┼╴
+╶─┼╴
+ │
+ ╵
+"""
)
MINIMAL_HEAVY_HEAD: Box = Box(
- " ╷ \n"
- " │ \n"
- "╺━┿╸\n"
- " │ \n"
- "╶─┼╴\n"
- "╶─┼╴\n"
- " │ \n"
- " ╵ \n"
+ """\
+ ╷
+ │
+╺━┿╸
+ │
+╶─┼╴
+╶─┼╴
+ │
+ ╵
+"""
)
MINIMAL_DOUBLE_HEAD: Box = Box(
- " ╷ \n"
- " │ \n"
- " ═╪ \n"
- " │ \n"
- " ─┼ \n"
- " ─┼ \n"
- " │ \n"
- " ╵ \n"
+ """\
+ ╷
+ │
+ ═╪
+ │
+ ─┼
+ ─┼
+ │
+ ╵
+"""
)
SIMPLE: Box = Box(
- " \n"
- " \n"
- " ── \n"
- " \n"
- " \n"
- " ── \n"
- " \n"
- " \n"
+ """\
+
+
+ ──
+
+
+ ──
+
+
+"""
)
SIMPLE_HEAD: Box = Box(
- " \n"
- " \n"
- " ── \n"
- " \n"
- " \n"
- " \n"
- " \n"
- " \n"
+ """\
+
+
+ ──
+
+
+
+
+
+"""
)
SIMPLE_HEAVY: Box = Box(
- " \n"
- " \n"
- " ━━ \n"
- " \n"
- " \n"
- " ━━ \n"
- " \n"
- " \n"
+ """\
+
+
+ ━━
+
+
+ ━━
+
+
+"""
)
HORIZONTALS: Box = Box(
- " ── \n"
- " \n"
- " ── \n"
- " \n"
- " ── \n"
- " ── \n"
- " \n"
- " ── \n"
+ """\
+ ──
+
+ ──
+
+ ──
+ ──
+
+ ──
+"""
)
ROUNDED: Box = Box(
- "╭─┬╮\n"
- "│ ││\n"
- "├─┼┤\n"
- "│ ││\n"
- "├─┼┤\n"
- "├─┼┤\n"
- "│ ││\n"
- "╰─┴╯\n"
+ """\
+╭─┬╮
+│ ││
+├─┼┤
+│ ││
+├─┼┤
+├─┼┤
+│ ││
+╰─┴╯
+"""
)
HEAVY: Box = Box(
- "┏━┳┓\n"
- "┃ ┃┃\n"
- "┣━╋┫\n"
- "┃ ┃┃\n"
- "┣━╋┫\n"
- "┣━╋┫\n"
- "┃ ┃┃\n"
- "┗━┻┛\n"
+ """\
+┏━┳┓
+┃ ┃┃
+┣━╋┫
+┃ ┃┃
+┣━╋┫
+┣━╋┫
+┃ ┃┃
+┗━┻┛
+"""
)
HEAVY_EDGE: Box = Box(
- "┏━┯┓\n"
- "┃ │┃\n"
- "┠─┼┨\n"
- "┃ │┃\n"
- "┠─┼┨\n"
- "┠─┼┨\n"
- "┃ │┃\n"
- "┗━┷┛\n"
+ """\
+┏━┯┓
+┃ │┃
+┠─┼┨
+┃ │┃
+┠─┼┨
+┠─┼┨
+┃ │┃
+┗━┷┛
+"""
)
HEAVY_HEAD: Box = Box(
- "┏━┳┓\n"
- "┃ ┃┃\n"
- "┡━╇┩\n"
- "│ ││\n"
- "├─┼┤\n"
- "├─┼┤\n"
- "│ ││\n"
- "└─┴┘\n"
+ """\
+┏━┳┓
+┃ ┃┃
+┡━╇┩
+│ ││
+├─┼┤
+├─┼┤
+│ ││
+└─┴┘
+"""
)
DOUBLE: Box = Box(
- "╔═╦╗\n"
- "║ ║║\n"
- "╠═╬╣\n"
- "║ ║║\n"
- "╠═╬╣\n"
- "╠═╬╣\n"
- "║ ║║\n"
- "╚═╩╝\n"
+ """\
+╔═╦╗
+║ ║║
+╠═╬╣
+║ ║║
+╠═╬╣
+╠═╬╣
+║ ║║
+╚═╩╝
+"""
)
DOUBLE_EDGE: Box = Box(
- "╔═╤╗\n"
- "║ │║\n"
- "╟─┼╢\n"
- "║ │║\n"
- "╟─┼╢\n"
- "╟─┼╢\n"
- "║ │║\n"
- "╚═╧╝\n"
+ """\
+╔═╤╗
+║ │║
+╟─┼╢
+║ │║
+╟─┼╢
+╟─┼╢
+║ │║
+╚═╧╝
+"""
)
MARKDOWN: Box = Box(
- " \n"
- "| ||\n"
- "|-||\n"
- "| ||\n"
- "|-||\n"
- "|-||\n"
- "| ||\n"
- " \n",
+ """\
+
+| ||
+|-||
+| ||
+|-||
+|-||
+| ||
+
+""",
ascii=True,
)
-# fmt: on
# Map Boxes that don't render with raster fonts on to equivalent that do
LEGACY_WINDOWS_SUBSTITUTIONS = {
@@ -422,6 +464,7 @@ def get_bottom(self, widths: Iterable[int]) -> str:
if __name__ == "__main__": # pragma: no cover
+
from pip._vendor.rich.columns import Columns
from pip._vendor.rich.panel import Panel
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/cells.py b/venv1/Lib/site-packages/pip/_vendor/rich/cells.py
index a8546227..9354f9e3 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/cells.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/cells.py
@@ -1,33 +1,11 @@
-from __future__ import annotations
-
+import re
from functools import lru_cache
-from typing import Callable
+from typing import Callable, List
from ._cell_widths import CELL_WIDTHS
-# Ranges of unicode ordinals that produce a 1-cell wide character
-# This is non-exhaustive, but covers most common Western characters
-_SINGLE_CELL_UNICODE_RANGES: list[tuple[int, int]] = [
- (0x20, 0x7E), # Latin (excluding non-printable)
- (0xA0, 0xAC),
- (0xAE, 0x002FF),
- (0x00370, 0x00482), # Greek / Cyrillic
- (0x02500, 0x025FC), # Box drawing, box elements, geometric shapes
- (0x02800, 0x028FF), # Braille
-]
-
-# A set of characters that are a single cell wide
-_SINGLE_CELLS = frozenset(
- [
- character
- for _start, _end in _SINGLE_CELL_UNICODE_RANGES
- for character in map(chr, range(_start, _end + 1))
- ]
-)
-
-# When called with a string this will return True if all
-# characters are single-cell, otherwise False
-_is_single_cell_widths: Callable[[str], bool] = _SINGLE_CELLS.issuperset
+# Regex to match sequence of the most common character ranges
+_is_single_cell_widths = re.compile("^[\u0020-\u006f\u00a0\u02ff\u0370-\u0482]*$").match
@lru_cache(4096)
@@ -43,9 +21,9 @@ def cached_cell_len(text: str) -> int:
Returns:
int: Get the number of cells required to display text.
"""
- if _is_single_cell_widths(text):
- return len(text)
- return sum(map(get_character_cell_size, text))
+ _get_size = get_character_cell_size
+ total_size = sum(_get_size(character) for character in text)
+ return total_size
def cell_len(text: str, _cell_len: Callable[[str], int] = cached_cell_len) -> int:
@@ -59,9 +37,9 @@ def cell_len(text: str, _cell_len: Callable[[str], int] = cached_cell_len) -> in
"""
if len(text) < 512:
return _cell_len(text)
- if _is_single_cell_widths(text):
- return len(text)
- return sum(map(get_character_cell_size, text))
+ _get_size = get_character_cell_size
+ total_size = sum(_get_size(character) for character in text)
+ return total_size
@lru_cache(maxsize=4096)
@@ -74,7 +52,20 @@ def get_character_cell_size(character: str) -> int:
Returns:
int: Number of cells (0, 1 or 2) occupied by that character.
"""
- codepoint = ord(character)
+ return _get_codepoint_cell_size(ord(character))
+
+
+@lru_cache(maxsize=4096)
+def _get_codepoint_cell_size(codepoint: int) -> int:
+ """Get the cell size of a character.
+
+ Args:
+ codepoint (int): Codepoint of a character.
+
+ Returns:
+ int: Number of cells (0, 1 or 2) occupied by that character.
+ """
+
_table = CELL_WIDTHS
lower_bound = 0
upper_bound = len(_table) - 1
@@ -128,44 +119,33 @@ def set_cell_size(text: str, total: int) -> str:
start = pos
-def chop_cells(
- text: str,
- width: int,
-) -> list[str]:
- """Split text into lines such that each line fits within the available (cell) width.
-
- Args:
- text: The text to fold such that it fits in the given width.
- width: The width available (number of cells).
-
- Returns:
- A list of strings such that each string in the list has cell width
- less than or equal to the available width.
- """
+# TODO: This is inefficient
+# TODO: This might not work with CWJ type characters
+def chop_cells(text: str, max_size: int, position: int = 0) -> List[str]:
+ """Break text in to equal (cell) length strings, returning the characters in reverse
+ order"""
_get_character_cell_size = get_character_cell_size
- lines: list[list[str]] = [[]]
-
- append_new_line = lines.append
- append_to_last_line = lines[-1].append
-
- total_width = 0
-
- for character in text:
- cell_width = _get_character_cell_size(character)
- char_doesnt_fit = total_width + cell_width > width
-
- if char_doesnt_fit:
- append_new_line([character])
- append_to_last_line = lines[-1].append
- total_width = cell_width
+ characters = [
+ (character, _get_character_cell_size(character)) for character in text
+ ]
+ total_size = position
+ lines: List[List[str]] = [[]]
+ append = lines[-1].append
+
+ for character, size in reversed(characters):
+ if total_size + size > max_size:
+ lines.append([character])
+ append = lines[-1].append
+ total_size = size
else:
- append_to_last_line(character)
- total_width += cell_width
+ total_size += size
+ append(character)
return ["".join(line) for line in lines]
if __name__ == "__main__": # pragma: no cover
+
print(get_character_cell_size("😽"))
for line in chop_cells("""这是对亚洲语言支持的测试。面对模棱两可的想法，拒绝猜测的诱惑。""", 8):
print(line)
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/color.py b/venv1/Lib/site-packages/pip/_vendor/rich/color.py
index e2c23a6a..dfe45593 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/color.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/color.py
@@ -1,5 +1,5 @@
+import platform
import re
-import sys
from colorsys import rgb_to_hls
from enum import IntEnum
from functools import lru_cache
@@ -15,7 +15,7 @@
from .text import Text
-WINDOWS = sys.platform == "win32"
+WINDOWS = platform.system() == "Windows"
class ColorSystem(IntEnum):
@@ -592,6 +592,7 @@ def blend_rgb(
if __name__ == "__main__": # pragma: no cover
+
from .console import Console
from .table import Table
from .text import Text
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/console.py b/venv1/Lib/site-packages/pip/_vendor/rich/console.py
index db2ba55a..7c363dfd 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/console.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/console.py
@@ -1,5 +1,6 @@
import inspect
import os
+import platform
import sys
import threading
import zlib
@@ -22,21 +23,27 @@
Dict,
Iterable,
List,
- Literal,
Mapping,
NamedTuple,
Optional,
- Protocol,
TextIO,
Tuple,
Type,
Union,
cast,
- runtime_checkable,
)
from pip._vendor.rich._null_file import NULL_FILE
+if sys.version_info >= (3, 8):
+ from typing import Literal, Protocol, runtime_checkable
+else:
+ from pip._vendor.typing_extensions import (
+ Literal,
+ Protocol,
+ runtime_checkable,
+ ) # pragma: no cover
+
from . import errors, themes
from ._emoji_replace import _emoji_replace
from ._export_format import CONSOLE_HTML_FORMAT, CONSOLE_SVG_FORMAT
@@ -69,7 +76,7 @@
JUPYTER_DEFAULT_COLUMNS = 115
JUPYTER_DEFAULT_LINES = 100
-WINDOWS = sys.platform == "win32"
+WINDOWS = platform.system() == "Windows"
HighlighterType = Callable[[Union[str, "Text"]], "Text"]
JustifyMethod = Literal["default", "left", "center", "right", "full"]
@@ -83,15 +90,15 @@ class NoChange:
NO_CHANGE = NoChange()
try:
- _STDIN_FILENO = sys.__stdin__.fileno() # type: ignore[union-attr]
+ _STDIN_FILENO = sys.__stdin__.fileno()
except Exception:
_STDIN_FILENO = 0
try:
- _STDOUT_FILENO = sys.__stdout__.fileno() # type: ignore[union-attr]
+ _STDOUT_FILENO = sys.__stdout__.fileno()
except Exception:
_STDOUT_FILENO = 1
try:
- _STDERR_FILENO = sys.__stderr__.fileno() # type: ignore[union-attr]
+ _STDERR_FILENO = sys.__stderr__.fileno()
except Exception:
_STDERR_FILENO = 2
@@ -271,7 +278,6 @@ def __rich_console__(
# A type that may be rendered by Console.
RenderableType = Union[ConsoleRenderable, RichCast, str]
-"""A string or any object that may be rendered by Rich."""
# The result of calling a __rich_console__ method.
RenderResult = Iterable[Union[RenderableType, Segment]]
@@ -494,7 +500,7 @@ def group(fit: bool = True) -> Callable[..., Callable[..., Group]]:
"""
def decorator(
- method: Callable[..., Iterable[RenderableType]],
+ method: Callable[..., Iterable[RenderableType]]
) -> Callable[..., Group]:
"""Convert a method that returns an iterable of renderables in to a Group."""
@@ -729,18 +735,8 @@ def __init__(
self.get_time = get_time or monotonic
self.style = style
self.no_color = (
- no_color
- if no_color is not None
- else self._environ.get("NO_COLOR", "") != ""
+ no_color if no_color is not None else "NO_COLOR" in self._environ
)
- if force_interactive is None:
- tty_interactive = self._environ.get("TTY_INTERACTIVE", None)
- if tty_interactive is not None:
- if tty_interactive == "0":
- force_interactive = False
- elif tty_interactive == "1":
- force_interactive = True
-
self.is_interactive = (
(self.is_terminal and not self.is_dumb_terminal)
if force_interactive is None
@@ -753,7 +749,7 @@ def __init__(
)
self._record_buffer: List[Segment] = []
self._render_hooks: List[RenderHook] = []
- self._live_stack: List[Live] = []
+ self._live: Optional["Live"] = None
self._is_alt_screen = False
def __repr__(self) -> str:
@@ -825,26 +821,24 @@ def _exit_buffer(self) -> None:
self._buffer_index -= 1
self._check_buffer()
- def set_live(self, live: "Live") -> bool:
- """Set Live instance. Used by Live context manager (no need to call directly).
+ def set_live(self, live: "Live") -> None:
+ """Set Live instance. Used by Live context manager.
Args:
live (Live): Live instance using this Console.
- Returns:
- Boolean that indicates if the live is the topmost of the stack.
-
Raises:
errors.LiveError: If this Console has a Live context currently active.
"""
with self._lock:
- self._live_stack.append(live)
- return len(self._live_stack) == 1
+ if self._live is not None:
+ raise errors.LiveError("Only one live display may be active at once")
+ self._live = live
def clear_live(self) -> None:
- """Clear the Live instance. Used by the Live context manager (no need to call directly)."""
+ """Clear the Live instance."""
with self._lock:
- self._live_stack.pop()
+ self._live = None
def push_render_hook(self, hook: RenderHook) -> None:
"""Add a new render hook to the stack.
@@ -939,13 +933,11 @@ def is_terminal(self) -> bool:
Returns:
bool: True if the console writing to a device capable of
- understanding escape sequences, otherwise False.
+ understanding terminal codes, otherwise False.
"""
- # If dev has explicitly set this value, return it
if self._force_terminal is not None:
return self._force_terminal
- # Fudge for Idle
if hasattr(sys.stdin, "__module__") and sys.stdin.__module__.startswith(
"idlelib"
):
@@ -956,22 +948,11 @@ def is_terminal(self) -> bool:
# return False for Jupyter, which may have FORCE_COLOR set
return False
- environ = self._environ
-
- tty_compatible = environ.get("TTY_COMPATIBLE", "")
- # 0 indicates device is not tty compatible
- if tty_compatible == "0":
- return False
- # 1 indicates device is tty compatible
- if tty_compatible == "1":
- return True
-
- # https://force-color.org/
- force_color = environ.get("FORCE_COLOR")
+ # If FORCE_COLOR env var has any value at all, we assume a terminal.
+ force_color = self._environ.get("FORCE_COLOR")
if force_color is not None:
- return force_color != ""
+ self._force_terminal = True
- # Any other value defaults to auto detect
isatty: Optional[Callable[[], bool]] = getattr(self.file, "isatty", None)
try:
return False if isatty is None else isatty()
@@ -996,13 +977,12 @@ def is_dumb_terminal(self) -> bool:
@property
def options(self) -> ConsoleOptions:
"""Get default console options."""
- size = self.size
return ConsoleOptions(
- max_height=size.height,
- size=size,
+ max_height=self.size.height,
+ size=self.size,
legacy_windows=self.legacy_windows,
min_width=1,
- max_width=size.width,
+ max_width=self.width,
encoding=self.encoding,
is_terminal=self.is_terminal,
)
@@ -1024,14 +1004,19 @@ def size(self) -> ConsoleDimensions:
width: Optional[int] = None
height: Optional[int] = None
- streams = _STD_STREAMS_OUTPUT if WINDOWS else _STD_STREAMS
- for file_descriptor in streams:
+ if WINDOWS: # pragma: no cover
try:
- width, height = os.get_terminal_size(file_descriptor)
+ width, height = os.get_terminal_size()
except (AttributeError, ValueError, OSError): # Probably not a terminal
pass
- else:
- break
+ else:
+ for file_descriptor in _STD_STREAMS:
+ try:
+ width, height = os.get_terminal_size(file_descriptor)
+ except (AttributeError, ValueError, OSError):
+ pass
+ else:
+ break
columns = self._environ.get("COLUMNS")
if columns is not None and columns.isdigit():
@@ -1322,7 +1307,7 @@ def render(
renderable = rich_cast(renderable)
if hasattr(renderable, "__rich_console__") and not isclass(renderable):
- render_iterable = renderable.__rich_console__(self, _options)
+ render_iterable = renderable.__rich_console__(self, _options) # type: ignore[union-attr]
elif isinstance(renderable, str):
text_renderable = self.render_str(
renderable, highlight=_options.highlight, markup=_options.markup
@@ -1399,14 +1384,9 @@ def render_lines(
extra_lines = render_options.height - len(lines)
if extra_lines > 0:
pad_line = [
- (
- [
- Segment(" " * render_options.max_width, style),
- Segment("\n"),
- ]
- if new_lines
- else [Segment(" " * render_options.max_width, style)]
- )
+ [Segment(" " * render_options.max_width, style), Segment("\n")]
+ if new_lines
+ else [Segment(" " * render_options.max_width, style)]
]
lines.extend(pad_line * extra_lines)
@@ -1455,11 +1435,9 @@ def render_str(
rich_text.overflow = overflow
else:
rich_text = Text(
- (
- _emoji_replace(text, default_variant=self._emoji_variant)
- if emoji_enabled
- else text
- ),
+ _emoji_replace(text, default_variant=self._emoji_variant)
+ if emoji_enabled
+ else text,
justify=justify,
overflow=overflow,
style=style,
@@ -1556,11 +1534,7 @@ def check_text() -> None:
if isinstance(renderable, str):
append_text(
self.render_str(
- renderable,
- emoji=emoji,
- markup=markup,
- highlight=highlight,
- highlighter=_highlighter,
+ renderable, emoji=emoji, markup=markup, highlighter=_highlighter
)
)
elif isinstance(renderable, Text):
@@ -1950,6 +1924,7 @@ def log(
end (str, optional): String to write at end of print data. Defaults to "\\\\n".
style (Union[str, Style], optional): A style to apply to output. Defaults to None.
justify (str, optional): One of "left", "right", "center", or "full". Defaults to ``None``.
+ overflow (str, optional): Overflow method: "crop", "fold", or "ellipsis". Defaults to None.
emoji (Optional[bool], optional): Enable emoji code, or ``None`` to use console default. Defaults to None.
markup (Optional[bool], optional): Enable markup, or ``None`` to use console default. Defaults to None.
highlight (Optional[bool], optional): Enable automatic highlighting, or ``None`` to use console default. Defaults to None.
@@ -2010,20 +1985,6 @@ def log(
):
buffer_extend(line)
- def on_broken_pipe(self) -> None:
- """This function is called when a `BrokenPipeError` is raised.
-
- This can occur when piping Textual output in Linux and macOS.
- The default implementation is to exit the app, but you could implement
- this method in a subclass to change the behavior.
-
- See https://docs.python.org/3/library/signal.html#note-on-sigpipe for details.
- """
- self.quiet = True
- devnull = os.open(os.devnull, os.O_WRONLY)
- os.dup2(devnull, sys.stdout.fileno())
- raise SystemExit(1)
-
def _check_buffer(self) -> None:
"""Check if the buffer may be rendered. Render it if it can (e.g. Console.quiet is False)
Rendering is supported on Windows, Unix and Jupyter environments. For
@@ -2033,21 +1994,13 @@ def _check_buffer(self) -> None:
if self.quiet:
del self._buffer[:]
return
-
- try:
- self._write_buffer()
- except BrokenPipeError:
- self.on_broken_pipe()
-
- def _write_buffer(self) -> None:
- """Write the buffer to the output file."""
-
with self._lock:
- if self.record and not self._buffer_index:
+ if self.record:
with self._record_buffer_lock:
self._record_buffer.extend(self._buffer[:])
if self._buffer_index == 0:
+
if self.is_jupyter: # pragma: no cover
from .jupyter import display
@@ -2213,7 +2166,7 @@ def save_text(self, path: str, *, clear: bool = True, styles: bool = False) -> N
"""
text = self.export_text(clear=clear, styles=styles)
- with open(path, "w", encoding="utf-8") as write_file:
+ with open(path, "wt", encoding="utf-8") as write_file:
write_file.write(text)
def export_html(
@@ -2319,7 +2272,7 @@ def save_html(
code_format=code_format,
inline_styles=inline_styles,
)
- with open(path, "w", encoding="utf-8") as write_file:
+ with open(path, "wt", encoding="utf-8") as write_file:
write_file.write(html)
def export_svg(
@@ -2608,7 +2561,7 @@ def save_svg(
font_aspect_ratio=font_aspect_ratio,
unique_id=unique_id,
)
- with open(path, "w", encoding="utf-8") as write_file:
+ with open(path, "wt", encoding="utf-8") as write_file:
write_file.write(svg)
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/containers.py b/venv1/Lib/site-packages/pip/_vendor/rich/containers.py
index 901ff8ba..e29cf368 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/containers.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/containers.py
@@ -1,13 +1,13 @@
from itertools import zip_longest
from typing import (
- TYPE_CHECKING,
- Iterable,
Iterator,
+ Iterable,
List,
Optional,
- TypeVar,
Union,
overload,
+ TypeVar,
+ TYPE_CHECKING,
)
if TYPE_CHECKING:
@@ -119,7 +119,7 @@ def justify(
Args:
console (Console): Console instance.
- width (int): Number of cells available per line.
+ width (int): Number of characters per line.
justify (str, optional): Default justify method for text: "left", "center", "full" or "right". Defaults to "left".
overflow (str, optional): Default overflow for text: "crop", "fold", or "ellipsis". Defaults to "fold".
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/control.py b/venv1/Lib/site-packages/pip/_vendor/rich/control.py
index 84963e9d..88fcb929 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/control.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/control.py
@@ -1,5 +1,11 @@
+import sys
import time
-from typing import TYPE_CHECKING, Callable, Dict, Iterable, List, Union, Final
+from typing import TYPE_CHECKING, Callable, Dict, Iterable, List, Union
+
+if sys.version_info >= (3, 8):
+ from typing import Final
+else:
+ from pip._vendor.typing_extensions import Final # pragma: no cover
from .segment import ControlCode, ControlType, Segment
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/default_styles.py b/venv1/Lib/site-packages/pip/_vendor/rich/default_styles.py
index 61797bf3..dca37193 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/default_styles.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/default_styles.py
@@ -54,7 +54,7 @@
"logging.level.notset": Style(dim=True),
"logging.level.debug": Style(color="green"),
"logging.level.info": Style(color="blue"),
- "logging.level.warning": Style(color="yellow"),
+ "logging.level.warning": Style(color="red"),
"logging.level.error": Style(color="red", bold=True),
"logging.level.critical": Style(color="red", bold=True, reverse=True),
"log.level": Style.null(),
@@ -120,9 +120,6 @@
"traceback.exc_type": Style(color="bright_red", bold=True),
"traceback.exc_value": Style.null(),
"traceback.offset": Style(color="bright_red", bold=True),
- "traceback.error_range": Style(underline=True, bold=True),
- "traceback.note": Style(color="green", bold=True),
- "traceback.group.border": Style(color="magenta"),
"bar.back": Style(color="grey23"),
"bar.complete": Style(color="rgb(249,38,114)"),
"bar.finished": Style(color="rgb(114,156,31)"),
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/diagnose.py b/venv1/Lib/site-packages/pip/_vendor/rich/diagnose.py
index 92893b32..ad361838 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/diagnose.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/diagnose.py
@@ -15,18 +15,16 @@ def report() -> None: # pragma: no cover
inspect(features)
env_names = (
- "CLICOLOR",
+ "TERM",
"COLORTERM",
+ "CLICOLOR",
+ "NO_COLOR",
+ "TERM_PROGRAM",
"COLUMNS",
- "JPY_PARENT_PID",
+ "LINES",
"JUPYTER_COLUMNS",
"JUPYTER_LINES",
- "LINES",
- "NO_COLOR",
- "TERM_PROGRAM",
- "TERM",
- "TTY_COMPATIBLE",
- "TTY_INTERACTIVE",
+ "JPY_PARENT_PID",
"VSCODE_VERBOSE_LOGGING",
)
env = {name: os.getenv(name) for name in env_names}
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/emoji.py b/venv1/Lib/site-packages/pip/_vendor/rich/emoji.py
index 4a667edd..791f0465 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/emoji.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/emoji.py
@@ -1,5 +1,5 @@
import sys
-from typing import TYPE_CHECKING, Optional, Union, Literal
+from typing import TYPE_CHECKING, Optional, Union
from .jupyter import JupyterMixin
from .segment import Segment
@@ -7,6 +7,11 @@
from ._emoji_codes import EMOJI
from ._emoji_replace import _emoji_replace
+if sys.version_info >= (3, 8):
+ from typing import Literal
+else:
+ from pip._vendor.typing_extensions import Literal # pragma: no cover
+
if TYPE_CHECKING:
from .console import Console, ConsoleOptions, RenderResult
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/filesize.py b/venv1/Lib/site-packages/pip/_vendor/rich/filesize.py
index 83bc9118..99f118e2 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/filesize.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/filesize.py
@@ -1,3 +1,4 @@
+# coding: utf-8
"""Functions for reporting filesizes. Borrowed from https://github.com/PyFilesystem/pyfilesystem2
The functions declared in this module should cover the different
@@ -26,7 +27,7 @@ def _to_str(
if size == 1:
return "1 byte"
elif size < base:
- return f"{size:,} bytes"
+ return "{:,} bytes".format(size)
for i, suffix in enumerate(suffixes, 2): # noqa: B007
unit = base**i
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/highlighter.py b/venv1/Lib/site-packages/pip/_vendor/rich/highlighter.py
index e4c462e2..c2646794 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/highlighter.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/highlighter.py
@@ -98,7 +98,7 @@ class ReprHighlighter(RegexHighlighter):
r"(?P(?\B(/[-\w._+]+)*\/)(?P[-\w._+]*)?",
r"(?b?'''.*?(?(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#~@]*)",
+ r"(?P(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#]*)",
),
]
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/json.py b/venv1/Lib/site-packages/pip/_vendor/rich/json.py
index 4087c79b..ea94493f 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/json.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/json.py
@@ -103,6 +103,7 @@ def __rich__(self) -> Text:
if __name__ == "__main__":
+
import argparse
import sys
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/layout.py b/venv1/Lib/site-packages/pip/_vendor/rich/layout.py
index a6f1a31b..849356ea 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/layout.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/layout.py
@@ -227,6 +227,7 @@ def tree(self) -> "Tree":
from pip._vendor.rich.tree import Tree
def summary(layout: "Layout") -> Table:
+
icon = layout.splitter.get_tree_icon()
table = Table.grid(padding=(0, 1, 0, 0))
@@ -402,7 +403,7 @@ def __rich_console__(
self._render_map = render_map
layout_lines: List[List[Segment]] = [[] for _ in range(height)]
_islice = islice
- for region, lines in render_map.values():
+ for (region, lines) in render_map.values():
_x, y, _layout_width, layout_height = region
for row, line in zip(
_islice(layout_lines, y, y + layout_height), lines
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/live.py b/venv1/Lib/site-packages/pip/_vendor/rich/live.py
index cc3a39bd..3ebbbc4c 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/live.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/live.py
@@ -1,12 +1,10 @@
-from __future__ import annotations
-
import sys
from threading import Event, RLock, Thread
from types import TracebackType
-from typing import IO, TYPE_CHECKING, Any, Callable, List, Optional, TextIO, Type, cast
+from typing import IO, Any, Callable, List, Optional, TextIO, Type, cast
from . import get_console
-from .console import Console, ConsoleRenderable, Group, RenderableType, RenderHook
+from .console import Console, ConsoleRenderable, RenderableType, RenderHook
from .control import Control
from .file_proxy import FileProxy
from .jupyter import JupyterMixin
@@ -14,10 +12,6 @@
from .screen import Screen
from .text import Text
-if TYPE_CHECKING:
- # Can be replaced with `from typing import Self` in Python 3.11+
- from typing_extensions import Self # pragma: no cover
-
class _RefreshThread(Thread):
"""A thread that calls refresh() at regular intervals."""
@@ -43,7 +37,7 @@ class Live(JupyterMixin, RenderHook):
Args:
renderable (RenderableType, optional): The renderable to live display. Defaults to displaying nothing.
- console (Console, optional): Optional Console instance. Defaults to an internal Console instance writing to stdout.
+ console (Console, optional): Optional Console instance. Default will an internal Console instance writing to stdout.
screen (bool, optional): Enable alternate screen mode. Defaults to False.
auto_refresh (bool, optional): Enable auto refresh. If disabled, you will need to call `refresh()` or `update()` with refresh flag. Defaults to True
refresh_per_second (float, optional): Number of times per second to refresh the live display. Defaults to 4.
@@ -93,7 +87,6 @@ def __init__(
self._live_render = LiveRender(
self.get_renderable(), vertical_overflow=vertical_overflow
)
- self._nested = False
@property
def is_started(self) -> bool:
@@ -117,12 +110,8 @@ def start(self, refresh: bool = False) -> None:
with self._lock:
if self._started:
return
+ self.console.set_live(self)
self._started = True
-
- if not self.console.set_live(self):
- self._nested = True
- return
-
if self._screen:
self._alt_screen = self.console.set_alt_screen(True)
self.console.show_cursor(False)
@@ -147,12 +136,8 @@ def stop(self) -> None:
with self._lock:
if not self._started:
return
- self._started = False
self.console.clear_live()
- if self._nested:
- if not self.transient:
- self.console.print(self.renderable)
- return
+ self._started = False
if self.auto_refresh and self._refresh_thread is not None:
self._refresh_thread.stop()
@@ -171,12 +156,13 @@ def stop(self) -> None:
self.console.show_cursor(True)
if self._alt_screen:
self.console.set_alt_screen(False)
+
if self.transient and not self._alt_screen:
self.console.control(self._live_render.restore_cursor())
if self.ipy_widget is not None and self.transient:
self.ipy_widget.close() # pragma: no cover
- def __enter__(self) -> Self:
+ def __enter__(self) -> "Live":
self.start(refresh=self._renderable is not None)
return self
@@ -214,13 +200,7 @@ def renderable(self) -> RenderableType:
Returns:
RenderableType: Displayed renderable.
"""
- live_stack = self.console._live_stack
- renderable: RenderableType
- if live_stack and self is live_stack[0]:
- # The first Live instance will render everything in the Live stack
- renderable = Group(*[live.get_renderable() for live in live_stack])
- else:
- renderable = self.get_renderable()
+ renderable = self.get_renderable()
return Screen(renderable) if self._alt_screen else renderable
def update(self, renderable: RenderableType, *, refresh: bool = False) -> None:
@@ -241,11 +221,6 @@ def refresh(self) -> None:
"""Update the display of the Live Render."""
with self._lock:
self._live_render.set_renderable(self.renderable)
- if self._nested:
- if self.console._live_stack:
- self.console._live_stack[0].refresh()
- return
-
if self.console.is_jupyter: # pragma: no cover
try:
from IPython.display import display
@@ -387,7 +362,7 @@ def process_renderables(
table.add_column("Destination Currency")
table.add_column("Exchange Rate")
- for (source, dest), exchange_rate in exchange_rate_dict.items():
+ for ((source, dest), exchange_rate) in exchange_rate_dict.items():
table.add_row(
source,
dest,
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/live_render.py b/venv1/Lib/site-packages/pip/_vendor/rich/live_render.py
index d3da5111..b90fbf7f 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/live_render.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/live_render.py
@@ -1,4 +1,10 @@
-from typing import Optional, Tuple, Literal
+import sys
+from typing import Optional, Tuple
+
+if sys.version_info >= (3, 8):
+ from typing import Literal
+else:
+ from pip._vendor.typing_extensions import Literal # pragma: no cover
from ._loop import loop_last
@@ -76,6 +82,7 @@ def restore_cursor(self) -> Control:
def __rich_console__(
self, console: Console, options: ConsoleOptions
) -> RenderResult:
+
renderable = self.renderable
style = console.get_style(self.style)
lines = console.render_lines(renderable, options, style=style, pad=False)
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/logging.py b/venv1/Lib/site-packages/pip/_vendor/rich/logging.py
index 08f34c70..91368dda 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/logging.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/logging.py
@@ -36,13 +36,11 @@ class RichHandler(Handler):
markup (bool, optional): Enable console markup in log messages. Defaults to False.
rich_tracebacks (bool, optional): Enable rich tracebacks with syntax highlighting and formatting. Defaults to False.
tracebacks_width (Optional[int], optional): Number of characters used to render tracebacks, or None for full width. Defaults to None.
- tracebacks_code_width (int, optional): Number of code characters used to render tracebacks, or None for full width. Defaults to 88.
tracebacks_extra_lines (int, optional): Additional lines of code to render tracebacks, or None for full width. Defaults to None.
tracebacks_theme (str, optional): Override pygments theme used in traceback.
tracebacks_word_wrap (bool, optional): Enable word wrapping of long tracebacks lines. Defaults to True.
tracebacks_show_locals (bool, optional): Enable display of locals in tracebacks. Defaults to False.
tracebacks_suppress (Sequence[Union[str, ModuleType]]): Optional sequence of modules or paths to exclude from traceback.
- tracebacks_max_frames (int, optional): Optional maximum number of frames returned by traceback.
locals_max_length (int, optional): Maximum length of containers before abbreviating, or None for no abbreviation.
Defaults to 10.
locals_max_string (int, optional): Maximum length of string before truncating, or None to disable. Defaults to 80.
@@ -76,13 +74,11 @@ def __init__(
markup: bool = False,
rich_tracebacks: bool = False,
tracebacks_width: Optional[int] = None,
- tracebacks_code_width: Optional[int] = 88,
tracebacks_extra_lines: int = 3,
tracebacks_theme: Optional[str] = None,
tracebacks_word_wrap: bool = True,
tracebacks_show_locals: bool = False,
tracebacks_suppress: Iterable[Union[str, ModuleType]] = (),
- tracebacks_max_frames: int = 100,
locals_max_length: int = 10,
locals_max_string: int = 80,
log_time_format: Union[str, FormatTimeCallable] = "[%x %X]",
@@ -108,8 +104,6 @@ def __init__(
self.tracebacks_word_wrap = tracebacks_word_wrap
self.tracebacks_show_locals = tracebacks_show_locals
self.tracebacks_suppress = tracebacks_suppress
- self.tracebacks_max_frames = tracebacks_max_frames
- self.tracebacks_code_width = tracebacks_code_width
self.locals_max_length = locals_max_length
self.locals_max_string = locals_max_string
self.keywords = keywords
@@ -146,7 +140,6 @@ def emit(self, record: LogRecord) -> None:
exc_value,
exc_traceback,
width=self.tracebacks_width,
- code_width=self.tracebacks_code_width,
extra_lines=self.tracebacks_extra_lines,
theme=self.tracebacks_theme,
word_wrap=self.tracebacks_word_wrap,
@@ -154,7 +147,6 @@ def emit(self, record: LogRecord) -> None:
locals_max_length=self.locals_max_length,
locals_max_string=self.locals_max_string,
suppress=self.tracebacks_suppress,
- max_frames=self.tracebacks_max_frames,
)
message = record.getMessage()
if self.formatter:
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/markup.py b/venv1/Lib/site-packages/pip/_vendor/rich/markup.py
index f6171878..fd80d8c1 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/markup.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/markup.py
@@ -64,9 +64,6 @@ def escape_backslashes(match: Match[str]) -> str:
return f"{backslashes}{backslashes}\\{text}"
markup = _escape(escape_backslashes, markup)
- if markup.endswith("\\") and not markup.endswith("\\\\"):
- return markup + "\\"
-
return markup
@@ -113,10 +110,7 @@ def render(
Args:
markup (str): A string containing console markup.
- style: (Union[str, Style]): The style to use.
emoji (bool, optional): Also render emoji code. Defaults to True.
- emoji_variant (str, optional): Optional emoji variant, either "text" or "emoji". Defaults to None.
-
Raises:
MarkupError: If there is a syntax error in the markup.
@@ -232,6 +226,7 @@ def pop_style(style_name: str) -> Tuple[int, Tag]:
if __name__ == "__main__": # pragma: no cover
+
MARKUP = [
"[red]Hello World[/red]",
"[magenta]Hello [b]World[/b]",
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/padding.py b/venv1/Lib/site-packages/pip/_vendor/rich/padding.py
index 0161cd18..1b2204f5 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/padding.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/padding.py
@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, List, Optional, Tuple, Union
+from typing import cast, List, Optional, Tuple, TYPE_CHECKING, Union
if TYPE_CHECKING:
from .console import (
@@ -7,11 +7,11 @@
RenderableType,
RenderResult,
)
-
from .jupyter import JupyterMixin
from .measure import Measurement
-from .segment import Segment
from .style import Style
+from .segment import Segment
+
PaddingDimensions = Union[int, Tuple[int], Tuple[int, int], Tuple[int, int, int, int]]
@@ -66,10 +66,10 @@ def unpack(pad: "PaddingDimensions") -> Tuple[int, int, int, int]:
_pad = pad[0]
return (_pad, _pad, _pad, _pad)
if len(pad) == 2:
- pad_top, pad_right = pad
+ pad_top, pad_right = cast(Tuple[int, int], pad)
return (pad_top, pad_right, pad_top, pad_right)
if len(pad) == 4:
- top, right, bottom, left = pad
+ top, right, bottom, left = cast(Tuple[int, int, int, int], pad)
return (top, right, bottom, left)
raise ValueError(f"1, 2 or 4 integers required for padding; {len(pad)} given")
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/panel.py b/venv1/Lib/site-packages/pip/_vendor/rich/panel.py
index 07587e3b..d522d80b 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/panel.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/panel.py
@@ -22,13 +22,11 @@ class Panel(JupyterMixin):
Args:
renderable (RenderableType): A console renderable object.
- box (Box): A Box instance that defines the look of the border (see :ref:`appendix_box`. Defaults to box.ROUNDED.
- title (Optional[TextType], optional): Optional title displayed in panel header. Defaults to None.
- title_align (AlignMethod, optional): Alignment of title. Defaults to "center".
- subtitle (Optional[TextType], optional): Optional subtitle displayed in panel footer. Defaults to None.
- subtitle_align (AlignMethod, optional): Alignment of subtitle. Defaults to "center".
+ box (Box, optional): A Box instance that defines the look of the border (see :ref:`appendix_box`.
+ Defaults to box.ROUNDED.
safe_box (bool, optional): Disable box characters that don't display on windows legacy terminal with *raster* fonts. Defaults to True.
- expand (bool, optional): If True the panel will stretch to fill the console width, otherwise it will be sized to fit the contents. Defaults to True.
+ expand (bool, optional): If True the panel will stretch to fill the console
+ width, otherwise it will be sized to fit the contents. Defaults to True.
style (str, optional): The style of the panel (border and contents). Defaults to "none".
border_style (str, optional): The style of the border. Defaults to "none".
width (Optional[int], optional): Optional width of panel. Defaults to None to auto-detect.
@@ -84,9 +82,7 @@ def fit(
style: StyleType = "none",
border_style: StyleType = "none",
width: Optional[int] = None,
- height: Optional[int] = None,
padding: PaddingDimensions = (0, 1),
- highlight: bool = False,
) -> "Panel":
"""An alternative constructor that sets expand=False."""
return cls(
@@ -100,9 +96,7 @@ def fit(
style=style,
border_style=border_style,
width=width,
- height=height,
padding=padding,
- highlight=highlight,
expand=False,
)
@@ -174,9 +168,6 @@ def align_text(
text = text.copy()
text.truncate(width)
excess_space = width - cell_len(text.plain)
- if text.style:
- text.stylize(console.get_style(text.style))
-
if excess_space:
if align == "left":
return Text.assemble(
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/pretty.py b/venv1/Lib/site-packages/pip/_vendor/rich/pretty.py
index c4a274f8..2bd9eb00 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/pretty.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/pretty.py
@@ -3,7 +3,6 @@
import dataclasses
import inspect
import os
-import reprlib
import sys
from array import array
from collections import Counter, UserDict, UserList, defaultdict, deque
@@ -16,7 +15,6 @@
Any,
Callable,
DefaultDict,
- Deque,
Dict,
Iterable,
List,
@@ -79,10 +77,7 @@ def _is_dataclass_repr(obj: object) -> bool:
# Digging in to a lot of internals here
# Catching all exceptions in case something is missing on a non CPython implementation
try:
- return obj.__repr__.__code__.co_filename in (
- dataclasses.__file__,
- reprlib.__file__,
- )
+ return obj.__repr__.__code__.co_filename == dataclasses.__file__
except Exception: # pragma: no coverage
return False
@@ -135,19 +130,17 @@ def _ipy_display_hook(
if _safe_isinstance(value, ConsoleRenderable):
console.line()
console.print(
- (
- value
- if _safe_isinstance(value, RichRenderable)
- else Pretty(
- value,
- overflow=overflow,
- indent_guides=indent_guides,
- max_length=max_length,
- max_string=max_string,
- max_depth=max_depth,
- expand_all=expand_all,
- margin=12,
- )
+ value
+ if _safe_isinstance(value, RichRenderable)
+ else Pretty(
+ value,
+ overflow=overflow,
+ indent_guides=indent_guides,
+ max_length=max_length,
+ max_string=max_string,
+ max_depth=max_depth,
+ expand_all=expand_all,
+ margin=12,
),
crop=crop,
new_line_start=True,
@@ -203,28 +196,23 @@ def display_hook(value: Any) -> None:
assert console is not None
builtins._ = None # type: ignore[attr-defined]
console.print(
- (
- value
- if _safe_isinstance(value, RichRenderable)
- else Pretty(
- value,
- overflow=overflow,
- indent_guides=indent_guides,
- max_length=max_length,
- max_string=max_string,
- max_depth=max_depth,
- expand_all=expand_all,
- )
+ value
+ if _safe_isinstance(value, RichRenderable)
+ else Pretty(
+ value,
+ overflow=overflow,
+ indent_guides=indent_guides,
+ max_length=max_length,
+ max_string=max_string,
+ max_depth=max_depth,
+ expand_all=expand_all,
),
crop=crop,
)
builtins._ = value # type: ignore[attr-defined]
- try:
+ if "get_ipython" in globals():
ip = get_ipython() # type: ignore[name-defined]
- except NameError:
- sys.displayhook = display_hook
- else:
from IPython.core.formatters import BaseFormatter
class RichFormatter(BaseFormatter): # type: ignore[misc]
@@ -248,6 +236,8 @@ def __call__(self, value: Any) -> Any:
# replace plain text formatter with rich formatter
rich_formatter = RichFormatter()
ip.display_formatter.formatters["text/plain"] = rich_formatter
+ else:
+ sys.displayhook = display_hook
class Pretty(JupyterMixin):
@@ -362,16 +352,6 @@ def _get_braces_for_defaultdict(_object: DefaultDict[Any, Any]) -> Tuple[str, st
)
-def _get_braces_for_deque(_object: Deque[Any]) -> Tuple[str, str, str]:
- if _object.maxlen is None:
- return ("deque([", "])", "deque()")
- return (
- "deque([",
- f"], maxlen={_object.maxlen})",
- f"deque(maxlen={_object.maxlen})",
- )
-
-
def _get_braces_for_array(_object: "array[Any]") -> Tuple[str, str, str]:
return (f"array({_object.typecode!r}, [", "])", f"array({_object.typecode!r})")
@@ -381,7 +361,7 @@ def _get_braces_for_array(_object: "array[Any]") -> Tuple[str, str, str]:
array: _get_braces_for_array,
defaultdict: _get_braces_for_defaultdict,
Counter: lambda _object: ("Counter({", "})", "Counter()"),
- deque: _get_braces_for_deque,
+ deque: lambda _object: ("deque([", "])", "deque()"),
dict: lambda _object: ("{", "}", "{}"),
UserDict: lambda _object: ("{", "}", "{}"),
frozenset: lambda _object: ("frozenset({", "})", "frozenset()"),
@@ -728,9 +708,9 @@ def iter_rich_args(rich_args: Any) -> Iterable[Union[Any, Tuple[str, Any]]]:
last=root,
)
- def iter_attrs() -> (
- Iterable[Tuple[str, Any, Optional[Callable[[Any], str]]]]
- ):
+ def iter_attrs() -> Iterable[
+ Tuple[str, Any, Optional[Callable[[Any], str]]]
+ ]:
"""Iterate over attr fields and values."""
for attr in attr_fields:
if attr.repr:
@@ -781,9 +761,7 @@ def iter_attrs() -> (
)
for last, field in loop_last(
- field
- for field in fields(obj)
- if field.repr and hasattr(obj, field.name)
+ field for field in fields(obj) if field.repr
):
child_node = _traverse(getattr(obj, field.name), depth=depth + 1)
child_node.key_repr = field.name
@@ -867,7 +845,7 @@ def iter_attrs() -> (
pop_visited(obj_id)
else:
node = Node(value_repr=to_repr(obj), last=root)
- node.is_tuple = type(obj) == tuple
+ node.is_tuple = _safe_isinstance(obj, tuple)
node.is_namedtuple = _is_namedtuple(obj)
return node
@@ -1007,7 +985,7 @@ class StockKeepingUnit(NamedTuple):
from pip._vendor.rich import print
- print(Pretty(data, indent_guides=True, max_string=20))
+ # print(Pretty(data, indent_guides=True, max_string=20))
class Thing:
def __repr__(self) -> str:
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/progress.py b/venv1/Lib/site-packages/pip/_vendor/rich/progress.py
index ef6ad60f..8b0a315f 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/progress.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/progress.py
@@ -1,6 +1,5 @@
-from __future__ import annotations
-
import io
+import sys
import typing
import warnings
from abc import ABC, abstractmethod
@@ -15,7 +14,6 @@
from threading import Event, RLock, Thread
from types import TracebackType
from typing import (
- TYPE_CHECKING,
Any,
BinaryIO,
Callable,
@@ -25,10 +23,10 @@
Generic,
Iterable,
List,
- Literal,
NamedTuple,
NewType,
Optional,
+ Sequence,
TextIO,
Tuple,
Type,
@@ -36,9 +34,10 @@
Union,
)
-if TYPE_CHECKING:
- # Can be replaced with `from typing import Self` in Python 3.11+
- from typing_extensions import Self # pragma: no cover
+if sys.version_info >= (3, 8):
+ from typing import Literal
+else:
+ from pip._vendor.typing_extensions import Literal # pragma: no cover
from . import filesize, get_console
from .console import Console, Group, JustifyMethod, RenderableType
@@ -71,7 +70,7 @@ def __init__(self, progress: "Progress", task_id: "TaskID", update_period: float
self.done = Event()
self.completed = 0
- super().__init__(daemon=True)
+ super().__init__()
def run(self) -> None:
task_id = self.task_id
@@ -79,7 +78,7 @@ def run(self) -> None:
update_period = self.update_period
last_completed = 0
wait = self.done.wait
- while not wait(update_period) and self.progress.live.is_started:
+ while not wait(update_period):
completed = self.completed
if last_completed != completed:
advance(task_id, completed - last_completed)
@@ -102,10 +101,9 @@ def __exit__(
def track(
- sequence: Iterable[ProgressType],
+ sequence: Union[Sequence[ProgressType], Iterable[ProgressType]],
description: str = "Working...",
total: Optional[float] = None,
- completed: int = 0,
auto_refresh: bool = True,
console: Optional[Console] = None,
transient: bool = False,
@@ -121,13 +119,10 @@ def track(
) -> Iterable[ProgressType]:
"""Track progress by iterating over a sequence.
- You can also track progress of an iterable, which might require that you additionally specify ``total``.
-
Args:
- sequence (Iterable[ProgressType]): Values you wish to iterate over and track progress.
+ sequence (Iterable[ProgressType]): A sequence (must support "len") you wish to iterate over.
description (str, optional): Description of task show next to progress bar. Defaults to "Working".
total: (float, optional): Total number of steps. Default is len(sequence).
- completed (int, optional): Number of steps completed so far. Defaults to 0.
auto_refresh (bool, optional): Automatic refresh, disable to force a refresh after each iteration. Default is True.
transient: (bool, optional): Clear the progress on exit. Defaults to False.
console (Console, optional): Console to write to. Default creates internal Console instance.
@@ -171,11 +166,7 @@ def track(
with progress:
yield from progress.track(
- sequence,
- total=total,
- completed=completed,
- description=description,
- update_period=update_period,
+ sequence, total=total, description=description, update_period=update_period
)
@@ -278,9 +269,6 @@ def tell(self) -> int:
def write(self, s: Any) -> int:
raise UnsupportedOperation("write")
- def writelines(self, lines: Iterable[Any]) -> None:
- raise UnsupportedOperation("writelines")
-
class _ReadContext(ContextManager[_I], Generic[_I]):
"""A utility class to handle a context for both a reader and a progress."""
@@ -693,7 +681,7 @@ def render(self, task: "Task") -> Text:
elapsed = task.finished_time if task.finished else task.elapsed
if elapsed is None:
return Text("-:--:--", style="progress.elapsed")
- delta = timedelta(seconds=max(0, int(elapsed)))
+ delta = timedelta(seconds=int(elapsed))
return Text(str(delta), style="progress.elapsed")
@@ -722,6 +710,7 @@ def __init__(
table_column: Optional[Column] = None,
show_speed: bool = False,
) -> None:
+
self.text_format_no_percentage = text_format_no_percentage
self.show_speed = show_speed
super().__init__(
@@ -1062,7 +1051,7 @@ class Progress(JupyterMixin):
"""Renders an auto-updating progress bar(s).
Args:
- console (Console, optional): Optional Console instance. Defaults to an internal Console instance writing to stdout.
+ console (Console, optional): Optional Console instance. Default will an internal Console instance writing to stdout.
auto_refresh (bool, optional): Enable auto refresh. If disabled, you will need to call `refresh()`.
refresh_per_second (Optional[float], optional): Number of times per second to refresh the progress information or None to use default (10). Defaults to None.
speed_estimate_period: (float, optional): Period (in seconds) used to calculate the speed estimate. Defaults to 30.
@@ -1125,7 +1114,7 @@ def get_default_columns(cls) -> Tuple[ProgressColumn, ...]:
progress = Progress(
SpinnerColumn(),
- *Progress.get_default_columns(),
+ *Progress.default_columns(),
"Elapsed:",
TimeElapsedColumn(),
)
@@ -1173,10 +1162,10 @@ def start(self) -> None:
def stop(self) -> None:
"""Stop the progress display."""
self.live.stop()
- if not self.console.is_interactive and not self.console.is_jupyter:
+ if not self.console.is_interactive:
self.console.print()
- def __enter__(self) -> Self:
+ def __enter__(self) -> "Progress":
self.start()
return self
@@ -1190,21 +1179,17 @@ def __exit__(
def track(
self,
- sequence: Iterable[ProgressType],
+ sequence: Union[Iterable[ProgressType], Sequence[ProgressType]],
total: Optional[float] = None,
- completed: int = 0,
task_id: Optional[TaskID] = None,
description: str = "Working...",
update_period: float = 0.1,
) -> Iterable[ProgressType]:
"""Track progress by iterating over a sequence.
- You can also track progress of an iterable, which might require that you additionally specify ``total``.
-
Args:
- sequence (Iterable[ProgressType]): Values you want to iterate over and track progress.
+ sequence (Sequence[ProgressType]): A sequence of values you want to iterate over and track progress.
total: (float, optional): Total number of steps. Default is len(sequence).
- completed (int, optional): Number of steps completed so far. Defaults to 0.
task_id: (TaskID): Task to track. Default is new task.
description: (str, optional): Description of task, if new task is created.
update_period (float, optional): Minimum time (in seconds) between calls to update(). Defaults to 0.1.
@@ -1216,9 +1201,9 @@ def track(
total = float(length_hint(sequence)) or None
if task_id is None:
- task_id = self.add_task(description, total=total, completed=completed)
+ task_id = self.add_task(description, total=total)
else:
- self.update(task_id, total=total, completed=completed)
+ self.update(task_id, total=total)
if self.live.auto_refresh:
with _TrackThread(self, task_id, update_period) as track_thread:
@@ -1342,7 +1327,7 @@ def open(
# normalize the mode (always rb, rt)
_mode = "".join(sorted(mode, reverse=False))
if _mode not in ("br", "rt", "r"):
- raise ValueError(f"invalid mode {mode!r}")
+ raise ValueError("invalid mode {!r}".format(mode))
# patch buffering to provide the same behaviour as the builtin `open`
line_buffering = buffering == 1
@@ -1651,6 +1636,7 @@ def remove_task(self, task_id: TaskID) -> None:
if __name__ == "__main__": # pragma: no coverage
+
import random
import time
@@ -1703,6 +1689,7 @@ def remove_task(self, task_id: TaskID) -> None:
console=console,
transient=False,
) as progress:
+
task1 = progress.add_task("[red]Downloading", total=1000)
task2 = progress.add_task("[green]Processing", total=1000)
task3 = progress.add_task("[yellow]Thinking", total=None)
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/progress_bar.py b/venv1/Lib/site-packages/pip/_vendor/rich/progress_bar.py
index 41794f76..67361df2 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/progress_bar.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/progress_bar.py
@@ -108,7 +108,7 @@ def _get_pulse_segments(
for index in range(PULSE_SIZE):
position = index / PULSE_SIZE
- fade = 0.5 + cos(position * pi * 2) / 2.0
+ fade = 0.5 + cos((position * pi * 2)) / 2.0
color = blend_rgb(fore_color, back_color, cross_fade=fade)
append(_Segment(bar, _Style(color=from_triplet(color))))
return segments
@@ -156,6 +156,7 @@ def _render_pulse(
def __rich_console__(
self, console: Console, options: ConsoleOptions
) -> RenderResult:
+
width = min(self.width or options.max_width, options.max_width)
ascii = options.legacy_windows or options.ascii_only
should_pulse = self.pulse or self.total is None
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/prompt.py b/venv1/Lib/site-packages/pip/_vendor/rich/prompt.py
index fccb70db..2bd0a772 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/prompt.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/prompt.py
@@ -36,7 +36,6 @@ class PromptBase(Generic[PromptType]):
console (Console, optional): A Console instance or None to use global console. Defaults to None.
password (bool, optional): Enable password input. Defaults to False.
choices (List[str], optional): A list of valid choices. Defaults to None.
- case_sensitive (bool, optional): Matching of choices should be case-sensitive. Defaults to True.
show_default (bool, optional): Show default in prompt. Defaults to True.
show_choices (bool, optional): Show choices in prompt. Defaults to True.
"""
@@ -58,7 +57,6 @@ def __init__(
console: Optional[Console] = None,
password: bool = False,
choices: Optional[List[str]] = None,
- case_sensitive: bool = True,
show_default: bool = True,
show_choices: bool = True,
) -> None:
@@ -71,7 +69,6 @@ def __init__(
self.password = password
if choices is not None:
self.choices = choices
- self.case_sensitive = case_sensitive
self.show_default = show_default
self.show_choices = show_choices
@@ -84,7 +81,6 @@ def ask(
console: Optional[Console] = None,
password: bool = False,
choices: Optional[List[str]] = None,
- case_sensitive: bool = True,
show_default: bool = True,
show_choices: bool = True,
default: DefaultType,
@@ -101,7 +97,6 @@ def ask(
console: Optional[Console] = None,
password: bool = False,
choices: Optional[List[str]] = None,
- case_sensitive: bool = True,
show_default: bool = True,
show_choices: bool = True,
stream: Optional[TextIO] = None,
@@ -116,7 +111,6 @@ def ask(
console: Optional[Console] = None,
password: bool = False,
choices: Optional[List[str]] = None,
- case_sensitive: bool = True,
show_default: bool = True,
show_choices: bool = True,
default: Any = ...,
@@ -132,7 +126,6 @@ def ask(
console (Console, optional): A Console instance or None to use global console. Defaults to None.
password (bool, optional): Enable password input. Defaults to False.
choices (List[str], optional): A list of valid choices. Defaults to None.
- case_sensitive (bool, optional): Matching of choices should be case-sensitive. Defaults to True.
show_default (bool, optional): Show default in prompt. Defaults to True.
show_choices (bool, optional): Show choices in prompt. Defaults to True.
stream (TextIO, optional): Optional text file open for reading to get input. Defaults to None.
@@ -142,7 +135,6 @@ def ask(
console=console,
password=password,
choices=choices,
- case_sensitive=case_sensitive,
show_default=show_default,
show_choices=show_choices,
)
@@ -220,9 +212,7 @@ def check_choice(self, value: str) -> bool:
bool: True if choice was valid, otherwise False.
"""
assert self.choices is not None
- if self.case_sensitive:
- return value.strip() in self.choices
- return value.strip().lower() in [choice.lower() for choice in self.choices]
+ return value.strip() in self.choices
def process_response(self, value: str) -> PromptType:
"""Process response from user, convert to prompt type.
@@ -242,17 +232,9 @@ def process_response(self, value: str) -> PromptType:
except ValueError:
raise InvalidResponse(self.validate_error_message)
- if self.choices is not None:
- if not self.check_choice(value):
- raise InvalidResponse(self.illegal_choice_message)
-
- if not self.case_sensitive:
- # return the original choice, not the lower case version
- return_value = self.response_type(
- self.choices[
- [choice.lower() for choice in self.choices].index(value.lower())
- ]
- )
+ if self.choices is not None and not self.check_choice(value):
+ raise InvalidResponse(self.illegal_choice_message)
+
return return_value
def on_validate_error(self, value: str, error: InvalidResponse) -> None:
@@ -325,7 +307,7 @@ class IntPrompt(PromptBase[int]):
validate_error_message = "[prompt.invalid]Please enter a valid integer number"
-class FloatPrompt(PromptBase[float]):
+class FloatPrompt(PromptBase[int]):
"""A prompt that returns a float.
Example:
@@ -364,6 +346,7 @@ def process_response(self, value: str) -> bool:
if __name__ == "__main__": # pragma: no cover
+
from pip._vendor.rich import print
if Confirm.ask("Run [i]prompt[/i] tests?", default=True):
@@ -389,12 +372,5 @@ def process_response(self, value: str) -> bool:
fruit = Prompt.ask("Enter a fruit", choices=["apple", "orange", "pear"])
print(f"fruit={fruit!r}")
- doggie = Prompt.ask(
- "What's the best Dog? (Case INSENSITIVE)",
- choices=["Border Terrier", "Collie", "Labradoodle"],
- case_sensitive=False,
- )
- print(f"doggie={doggie!r}")
-
else:
print("[b]OK :loudly_crying_face:")
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/py.typed b/venv1/Lib/site-packages/pip/_vendor/rich/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/repr.py b/venv1/Lib/site-packages/pip/_vendor/rich/repr.py
index 10efc427..f284bcaf 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/repr.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/repr.py
@@ -76,7 +76,7 @@ def auto_rich_repr(self: Type[T]) -> Result:
param.POSITIONAL_OR_KEYWORD,
param.KEYWORD_ONLY,
):
- if param.default is param.empty:
+ if param.default == param.empty:
yield getattr(self, param.name)
else:
yield param.name, getattr(self, param.name), param.default
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/segment.py b/venv1/Lib/site-packages/pip/_vendor/rich/segment.py
index 4b5f9979..e1257984 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/segment.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/segment.py
@@ -109,51 +109,42 @@ def is_control(self) -> bool:
@classmethod
@lru_cache(1024 * 16)
def _split_cells(cls, segment: "Segment", cut: int) -> Tuple["Segment", "Segment"]:
- """Split a segment in to two at a given cell position.
- Note that splitting a double-width character, may result in that character turning
- into two spaces.
-
- Args:
- segment (Segment): A segment to split.
- cut (int): A cell position to cut on.
-
- Returns:
- A tuple of two segments.
- """
text, style, control = segment
_Segment = Segment
+
cell_length = segment.cell_length
if cut >= cell_length:
return segment, _Segment("", style, control)
cell_size = get_character_cell_size
- pos = int((cut / cell_length) * len(text))
+ pos = int((cut / cell_length) * (len(text) - 1))
- while True:
+ before = text[:pos]
+ cell_pos = cell_len(before)
+ if cell_pos == cut:
+ return (
+ _Segment(before, style, control),
+ _Segment(text[pos:], style, control),
+ )
+ while pos < len(text):
+ char = text[pos]
+ pos += 1
+ cell_pos += cell_size(char)
before = text[:pos]
- cell_pos = cell_len(before)
- out_by = cell_pos - cut
- if not out_by:
+ if cell_pos == cut:
return (
_Segment(before, style, control),
_Segment(text[pos:], style, control),
)
- if out_by == -1 and cell_size(text[pos]) == 2:
- return (
- _Segment(text[:pos] + " ", style, control),
- _Segment(" " + text[pos + 1 :], style, control),
- )
- if out_by == +1 and cell_size(text[pos - 1]) == 2:
+ if cell_pos > cut:
return (
- _Segment(text[: pos - 1] + " ", style, control),
+ _Segment(before[: pos - 1] + " ", style, control),
_Segment(" " + text[pos:], style, control),
)
- if cell_pos < cut:
- pos += 1
- else:
- pos -= 1
+
+ raise AssertionError("Will never reach here")
def split_cells(self, cut: int) -> Tuple["Segment", "Segment"]:
"""Split segment in to two segments at the specified column.
@@ -161,14 +152,10 @@ def split_cells(self, cut: int) -> Tuple["Segment", "Segment"]:
If the cut point falls in the middle of a 2-cell wide character then it is replaced
by two spaces, to preserve the display width of the parent segment.
- Args:
- cut (int): Offset within the segment to cut.
-
Returns:
Tuple[Segment, Segment]: Two segments.
"""
text, style, control = self
- assert cut >= 0
if _is_single_cell_widths(text):
# Fast path with all 1 cell characters
@@ -618,7 +605,7 @@ def divide(
while True:
cut = next(iter_cuts, -1)
if cut == -1:
- return
+ return []
if cut != 0:
break
yield []
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/spinner.py b/venv1/Lib/site-packages/pip/_vendor/rich/spinner.py
index a3a3caf8..91ea630e 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/spinner.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/spinner.py
@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, List, Optional, Union, cast
+from typing import cast, List, Optional, TYPE_CHECKING, Union
from ._spinners import SPINNERS
from .measure import Measurement
@@ -6,7 +6,7 @@
from .text import Text
if TYPE_CHECKING:
- from .console import Console, ConsoleOptions, RenderableType, RenderResult
+ from .console import Console, ConsoleOptions, RenderResult, RenderableType
from .style import StyleType
@@ -38,7 +38,6 @@ def __init__(
self.text: "Union[RenderableType, Text]" = (
Text.from_markup(text) if isinstance(text, str) else text
)
- self.name = name
self.frames = cast(List[str], spinner["frames"])[:]
self.interval = cast(float, spinner["interval"])
self.start_time: Optional[float] = None
@@ -117,16 +116,22 @@ def update(
if __name__ == "__main__": # pragma: no cover
from time import sleep
- from .console import Group
+ from .columns import Columns
+ from .panel import Panel
from .live import Live
- all_spinners = Group(
- *[
+ all_spinners = Columns(
+ [
Spinner(spinner_name, text=Text(repr(spinner_name), style="green"))
for spinner_name in sorted(SPINNERS.keys())
- ]
+ ],
+ column_first=True,
+ expand=True,
)
- with Live(all_spinners, refresh_per_second=20) as live:
+ with Live(
+ Panel(all_spinners, title="Spinners", border_style="blue"),
+ refresh_per_second=20,
+ ) as live:
while True:
sleep(0.1)
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/status.py b/venv1/Lib/site-packages/pip/_vendor/rich/status.py
index 65744838..09eff405 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/status.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/status.py
@@ -107,6 +107,7 @@ def __exit__(
if __name__ == "__main__": # pragma: no cover
+
from time import sleep
from .console import Console
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/style.py b/venv1/Lib/site-packages/pip/_vendor/rich/style.py
index 52942418..313c8894 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/style.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/style.py
@@ -1,7 +1,6 @@
import sys
from functools import lru_cache
-from operator import attrgetter
-from pickle import dumps, loads
+from marshal import dumps, loads
from random import randint
from typing import Any, Dict, Iterable, List, Optional, Type, Union, cast
@@ -10,10 +9,6 @@
from .repr import Result, rich_repr
from .terminal_theme import DEFAULT_TERMINAL_THEME, TerminalTheme
-_hash_getter = attrgetter(
- "_color", "_bgcolor", "_attributes", "_set_attributes", "_link", "_meta"
-)
-
# Style instances and style definitions are often interchangeable
StyleType = Union[str, "Style"]
@@ -437,7 +432,16 @@ def __ne__(self, other: Any) -> bool:
def __hash__(self) -> int:
if self._hash is not None:
return self._hash
- self._hash = hash(_hash_getter(self))
+ self._hash = hash(
+ (
+ self._color,
+ self._bgcolor,
+ self._attributes,
+ self._set_attributes,
+ self._link,
+ self._meta,
+ )
+ )
return self._hash
@property
@@ -520,7 +524,7 @@ def parse(cls, style_definition: str) -> "Style":
if not word:
raise errors.StyleSyntaxError("color expected after 'on'")
try:
- Color.parse(word)
+ Color.parse(word) is None
except ColorParseError as error:
raise errors.StyleSyntaxError(
f"unable to parse {word!r} as background color; {error}"
@@ -659,7 +663,7 @@ def clear_meta_and_links(self) -> "Style":
style._set_attributes = self._set_attributes
style._link = None
style._link_id = ""
- style._hash = None
+ style._hash = self._hash
style._null = False
style._meta = None
return style
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/syntax.py b/venv1/Lib/site-packages/pip/_vendor/rich/syntax.py
index ec0d903e..25b226a3 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/syntax.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/syntax.py
@@ -1,6 +1,5 @@
-from __future__ import annotations
-
import os.path
+import platform
import re
import sys
import textwrap
@@ -53,7 +52,7 @@
TokenType = Tuple[str, ...]
-WINDOWS = sys.platform == "win32"
+WINDOWS = platform.system() == "Windows"
DEFAULT_THEME = "monokai"
# The following styles are based on https://github.com/pygments/pygments/blob/master/pygments/formatters/terminal.py
@@ -223,18 +222,6 @@ class _SyntaxHighlightRange(NamedTuple):
style: StyleType
start: SyntaxPosition
end: SyntaxPosition
- style_before: bool = False
-
-
-class PaddingProperty:
- """Descriptor to get and set padding."""
-
- def __get__(self, obj: Syntax, objtype: Type[Syntax]) -> Tuple[int, int, int, int]:
- """Space around the Syntax."""
- return obj._padding
-
- def __set__(self, obj: Syntax, padding: PaddingDimensions) -> None:
- obj._padding = Padding.unpack(padding)
class Syntax(JupyterMixin):
@@ -306,13 +293,11 @@ def __init__(
Style(bgcolor=background_color) if background_color else Style()
)
self.indent_guides = indent_guides
- self._padding = Padding.unpack(padding)
+ self.padding = padding
self._theme = self.get_theme(theme)
self._stylized_ranges: List[_SyntaxHighlightRange] = []
- padding = PaddingProperty()
-
@classmethod
def from_path(
cls,
@@ -386,8 +371,8 @@ def guess_lexer(cls, path: str, code: Optional[str] = None) -> str:
is supplied, the lexer will be chosen based on the file extension..
Args:
- path (AnyStr): The path to the file containing the code you wish to know the lexer for.
- code (str, optional): Optional string of code that will be used as a fallback if no lexer
+ path (AnyStr): The path to the file containing the code you wish to know the lexer for.
+ code (str, optional): Optional string of code that will be used as a fallback if no lexer
is found for the supplied path.
Returns:
@@ -454,16 +439,6 @@ def lexer(self) -> Optional[Lexer]:
except ClassNotFound:
return None
- @property
- def default_lexer(self) -> Lexer:
- """A Pygments Lexer to use if one is not specified or invalid."""
- return get_lexer_by_name(
- "text",
- stripnl=False,
- ensurenl=True,
- tabsize=self.tab_size,
- )
-
def highlight(
self,
code: str,
@@ -492,7 +467,7 @@ def highlight(
)
_get_theme_style = self._theme.get_style_for_token
- lexer = self.lexer or self.default_lexer
+ lexer = self.lexer
if lexer is None:
text.append(code)
@@ -550,11 +525,7 @@ def tokens_to_spans() -> Iterable[Tuple[str, Optional[Style]]]:
return text
def stylize_range(
- self,
- style: StyleType,
- start: SyntaxPosition,
- end: SyntaxPosition,
- style_before: bool = False,
+ self, style: StyleType, start: SyntaxPosition, end: SyntaxPosition
) -> None:
"""
Adds a custom style on a part of the code, that will be applied to the syntax display when it's rendered.
@@ -564,11 +535,8 @@ def stylize_range(
style (StyleType): The style to apply.
start (Tuple[int, int]): The start of the range, in the form `[line number, column index]`.
end (Tuple[int, int]): The end of the range, in the form `[line number, column index]`.
- style_before (bool): Apply the style before any existing styles.
"""
- self._stylized_ranges.append(
- _SyntaxHighlightRange(style, start, end, style_before)
- )
+ self._stylized_ranges.append(_SyntaxHighlightRange(style, start, end))
def _get_line_numbers_color(self, blend: float = 0.3) -> Color:
background_style = self._theme.get_background_style() + self.background_style
@@ -622,7 +590,8 @@ def _get_number_styles(self, console: Console) -> Tuple[Style, Style, Style]:
def __rich_measure__(
self, console: "Console", options: "ConsoleOptions"
) -> "Measurement":
- _, right, _, left = self.padding
+
+ _, right, _, left = Padding.unpack(self.padding)
padding = left + right
if self.code_width is not None:
width = self.code_width + self._numbers_column_width + padding + 1
@@ -641,8 +610,10 @@ def __rich_console__(
self, console: Console, options: ConsoleOptions
) -> RenderResult:
segments = Segments(self._get_syntax(console, options))
- if any(self.padding):
- yield Padding(segments, style=self._get_base_style(), pad=self.padding)
+ if self.padding:
+ yield Padding(
+ segments, style=self._theme.get_background_style(), pad=self.padding
+ )
else:
yield segments
@@ -655,19 +626,15 @@ def _get_syntax(
Get the Segments for the Syntax object, excluding any vertical/horizontal padding
"""
transparent_background = self._get_base_style().transparent_background
- _pad_top, pad_right, _pad_bottom, pad_left = self.padding
- horizontal_padding = pad_left + pad_right
code_width = (
(
(options.max_width - self._numbers_column_width - 1)
if self.line_numbers
else options.max_width
)
- - horizontal_padding
if self.code_width is None
else self.code_width
)
- code_width = max(0, code_width)
ends_on_nl, processed_code = self._process_code(self.code)
text = self.highlight(processed_code, self.line_range)
@@ -721,7 +688,7 @@ def _get_syntax(
lines = (
Text("\n")
.join(lines)
- .with_indent_guides(self.tab_size, style=style + Style(italic=False))
+ .with_indent_guides(self.tab_size, style=style)
.split("\n", allow_blank=True)
)
@@ -812,10 +779,7 @@ def _apply_stylized_ranges(self, text: Text) -> None:
newlines_offsets, stylized_range.end
)
if start is not None and end is not None:
- if stylized_range.style_before:
- text.stylize_before(stylized_range.style, start, end)
- else:
- text.stylize(stylized_range.style, start, end)
+ text.stylize(stylized_range.style, start, end)
def _process_code(self, code: str) -> Tuple[bool, str]:
"""
@@ -866,6 +830,7 @@ def _get_code_index_for_syntax_position(
if __name__ == "__main__": # pragma: no cover
+
import argparse
import sys
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/table.py b/venv1/Lib/site-packages/pip/_vendor/rich/table.py
index 2b9e3b5d..17409f2e 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/table.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/table.py
@@ -54,7 +54,7 @@ class Column:
show_footer (bool, optional): Show a footer row. Defaults to False.
show_edge (bool, optional): Draw a box around the outside of the table. Defaults to True.
show_lines (bool, optional): Draw lines between every row. Defaults to False.
- leading (int, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
+ leading (bool, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
style (Union[str, Style], optional): Default style for the table. Defaults to "none".
row_styles (List[Union, str], optional): Optional list of row styles, if more than one style is given then the styles will alternate. Defaults to None.
header_style (Union[str, Style], optional): Style of the header. Defaults to "table.header".
@@ -106,9 +106,6 @@ class Column:
no_wrap: bool = False
"""bool: Prevent wrapping of text within the column. Defaults to ``False``."""
- highlight: bool = False
- """bool: Apply highlighter to column. Defaults to ``False``."""
-
_index: int = 0
"""Index of column."""
@@ -170,7 +167,7 @@ class Table(JupyterMixin):
show_footer (bool, optional): Show a footer row. Defaults to False.
show_edge (bool, optional): Draw a box around the outside of the table. Defaults to True.
show_lines (bool, optional): Draw lines between every row. Defaults to False.
- leading (int, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
+ leading (bool, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
style (Union[str, Style], optional): Default style for the table. Defaults to "none".
row_styles (List[Union, str], optional): Optional list of row styles, if more than one style is given then the styles will alternate. Defaults to None.
header_style (Union[str, Style], optional): Style of the header. Defaults to "table.header".
@@ -215,6 +212,7 @@ def __init__(
caption_justify: "JustifyMethod" = "center",
highlight: bool = False,
) -> None:
+
self.columns: List[Column] = []
self.rows: List[Row] = []
self.title = title
@@ -368,7 +366,6 @@ def add_column(
footer: "RenderableType" = "",
*,
header_style: Optional[StyleType] = None,
- highlight: Optional[bool] = None,
footer_style: Optional[StyleType] = None,
style: Optional[StyleType] = None,
justify: "JustifyMethod" = "left",
@@ -388,7 +385,6 @@ def add_column(
footer (RenderableType, optional): Text or renderable for the footer.
Defaults to "".
header_style (Union[str, Style], optional): Style for the header, or None for default. Defaults to None.
- highlight (bool, optional): Whether to highlight the text. The default of None uses the value of the table (self) object.
footer_style (Union[str, Style], optional): Style for the footer, or None for default. Defaults to None.
style (Union[str, Style], optional): Style for the column cells, or None for default. Defaults to None.
justify (JustifyMethod, optional): Alignment for cells. Defaults to "left".
@@ -406,7 +402,6 @@ def add_column(
header=header,
footer=footer,
header_style=header_style or "",
- highlight=highlight if highlight is not None else self.highlight,
footer_style=footer_style or "",
style=style or "",
justify=justify,
@@ -451,7 +446,7 @@ def add_cell(column: Column, renderable: "RenderableType") -> None:
]
for index, renderable in enumerate(cell_renderables):
if index == len(columns):
- column = Column(_index=index, highlight=self.highlight)
+ column = Column(_index=index)
for _ in self.rows:
add_cell(column, Text(""))
self.columns.append(column)
@@ -476,6 +471,7 @@ def add_section(self) -> None:
def __rich_console__(
self, console: "Console", options: "ConsoleOptions"
) -> "RenderResult":
+
if not self.columns:
yield Segment("\n")
return
@@ -689,7 +685,7 @@ def get_padding(first_row: bool, last_row: bool) -> Tuple[int, int, int, int]:
getattr(renderable, "vertical", None) or column.vertical,
)
else:
- for style, renderable in raw_cells:
+ for (style, renderable) in raw_cells:
yield _Cell(
style,
renderable,
@@ -781,16 +777,16 @@ def _render(
_Segment(_box.head_right, border_style),
_Segment(_box.head_vertical, border_style),
),
- (
- _Segment(_box.mid_left, border_style),
- _Segment(_box.mid_right, border_style),
- _Segment(_box.mid_vertical, border_style),
- ),
(
_Segment(_box.foot_left, border_style),
_Segment(_box.foot_right, border_style),
_Segment(_box.foot_vertical, border_style),
),
+ (
+ _Segment(_box.mid_left, border_style),
+ _Segment(_box.mid_right, border_style),
+ _Segment(_box.mid_vertical, border_style),
+ ),
]
if show_edge:
yield _Segment(_box.get_top(widths), border_style)
@@ -824,7 +820,6 @@ def _render(
no_wrap=column.no_wrap,
overflow=column.overflow,
height=None,
- highlight=column.highlight,
)
lines = console.render_lines(
cell.renderable,
@@ -929,6 +924,7 @@ def align_cell(
if __name__ == "__main__": # pragma: no cover
from pip._vendor.rich.console import Console
from pip._vendor.rich.highlighter import ReprHighlighter
+ from pip._vendor.rich.table import Table as Table
from ._timer import timer
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/text.py b/venv1/Lib/site-packages/pip/_vendor/rich/text.py
index 5a0c6b14..998cb87d 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/text.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/text.py
@@ -11,7 +11,6 @@
List,
NamedTuple,
Optional,
- Pattern,
Tuple,
Union,
)
@@ -39,7 +38,6 @@
_re_whitespace = re.compile(r"\s+$")
TextType = Union[str, "Text"]
-"""A plain string or a :class:`Text` instance."""
GetStyleCallable = Callable[[str], Optional[StyleType]]
@@ -99,21 +97,6 @@ def right_crop(self, offset: int) -> "Span":
return self
return Span(start, min(offset, end), style)
- def extend(self, cells: int) -> "Span":
- """Extend the span by the given number of cells.
-
- Args:
- cells (int): Additional space to add to end of span.
-
- Returns:
- Span: A span.
- """
- if cells:
- start, end, style = self
- return Span(start, end + cells, style)
- else:
- return self
-
class Text(JupyterMixin):
"""Text with color / style.
@@ -125,7 +108,7 @@ class Text(JupyterMixin):
overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
no_wrap (bool, optional): Disable text wrapping, or None for default. Defaults to None.
end (str, optional): Character to end text with. Defaults to "\\\\n".
- tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
+ tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
spans (List[Span], optional). A list of predefined style spans. Defaults to None.
"""
@@ -150,7 +133,7 @@ def __init__(
overflow: Optional["OverflowMethod"] = None,
no_wrap: Optional[bool] = None,
end: str = "\n",
- tab_size: Optional[int] = None,
+ tab_size: Optional[int] = 8,
spans: Optional[List[Span]] = None,
) -> None:
sanitized_text = strip_control_codes(text)
@@ -174,7 +157,7 @@ def __str__(self) -> str:
return self.plain
def __repr__(self) -> str:
- return f""
+ return f""
def __add__(self, other: Any) -> "Text":
if isinstance(other, (str, Text)):
@@ -272,9 +255,7 @@ def from_markup(
Args:
text (str): A string containing console markup.
- style (Union[str, Style], optional): Base style for text. Defaults to "".
emoji (bool, optional): Also render emoji code. Defaults to True.
- emoji_variant (str, optional): Optional emoji variant, either "text" or "emoji". Defaults to None.
justify (str, optional): Justify method: "left", "center", "full", "right". Defaults to None.
overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
end (str, optional): Character to end text with. Defaults to "\\\\n".
@@ -311,7 +292,7 @@ def from_ansi(
overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
no_wrap (bool, optional): Disable text wrapping, or None for default. Defaults to None.
end (str, optional): Character to end text with. Defaults to "\\\\n".
- tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
+ tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
"""
from .ansi import AnsiDecoder
@@ -372,9 +353,8 @@ def assemble(
style (Union[str, Style], optional): Base style for text. Defaults to "".
justify (str, optional): Justify method: "left", "center", "full", "right". Defaults to None.
overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
- no_wrap (bool, optional): Disable text wrapping, or None for default. Defaults to None.
end (str, optional): Character to end text with. Defaults to "\\\\n".
- tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
+ tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
meta (Dict[str, Any], optional). Meta data to apply to text, or None for no meta data. Default to None
Returns:
@@ -428,7 +408,7 @@ def spans(self, spans: List[Span]) -> None:
self._spans = spans[:]
def blank_copy(self, plain: str = "") -> "Text":
- """Return a new Text instance with copied metadata (but not the string or spans)."""
+ """Return a new Text instance with copied meta data (but not the string or spans)."""
copy_self = Text(
plain,
style=self.style,
@@ -509,7 +489,7 @@ def stylize_before(
def apply_meta(
self, meta: Dict[str, Any], start: int = 0, end: Optional[int] = None
) -> None:
- """Apply metadata to the text, or a portion of the text.
+ """Apply meta data to the text, or a portion of the text.
Args:
meta (Dict[str, Any]): A dict of meta information.
@@ -569,30 +549,9 @@ def get_style_at_offset(self, console: "Console", offset: int) -> Style:
style += get_style(span_style, default="")
return style
- def extend_style(self, spaces: int) -> None:
- """Extend the Text given number of spaces where the spaces have the same style as the last character.
-
- Args:
- spaces (int): Number of spaces to add to the Text.
- """
- if spaces <= 0:
- return
- spans = self.spans
- new_spaces = " " * spaces
- if spans:
- end_offset = len(self)
- self._spans[:] = [
- span.extend(spaces) if span.end >= end_offset else span
- for span in spans
- ]
- self._text.append(new_spaces)
- self._length += spaces
- else:
- self.plain += new_spaces
-
def highlight_regex(
self,
- re_highlight: Union[Pattern[str], str],
+ re_highlight: str,
style: Optional[Union[GetStyleCallable, StyleType]] = None,
*,
style_prefix: str = "",
@@ -601,7 +560,7 @@ def highlight_regex(
translated to styles.
Args:
- re_highlight (Union[re.Pattern, str]): A regular expression object or string.
+ re_highlight (str): A regular expression.
style (Union[GetStyleCallable, StyleType]): Optional style to apply to whole match, or a callable
which accepts the matched text and returns a style. Defaults to None.
style_prefix (str, optional): Optional prefix to add to style group names.
@@ -613,9 +572,7 @@ def highlight_regex(
append_span = self._spans.append
_Span = Span
plain = self.plain
- if isinstance(re_highlight, str):
- re_highlight = re.compile(re_highlight)
- for match in re_highlight.finditer(plain):
+ for match in re.finditer(re_highlight, plain):
get_span = match.span
if style:
start, end = get_span()
@@ -640,9 +597,9 @@ def highlight_words(
"""Highlight words with a style.
Args:
- words (Iterable[str]): Words to highlight.
+ words (Iterable[str]): Worlds to highlight.
style (Union[str, Style]): Style to apply.
- case_sensitive (bool, optional): Enable case sensitive matching. Defaults to True.
+ case_sensitive (bool, optional): Enable case sensitive matchings. Defaults to True.
Returns:
int: Number of words highlighted.
@@ -689,7 +646,7 @@ def set_length(self, new_length: int) -> None:
def __rich_console__(
self, console: "Console", options: "ConsoleOptions"
) -> Iterable[Segment]:
- tab_size: int = console.tab_size if self.tab_size is None else self.tab_size
+ tab_size: int = console.tab_size or self.tab_size or 8
justify = self.justify or options.justify or DEFAULT_JUSTIFY
overflow = self.overflow or options.overflow or DEFAULT_OVERFLOW
@@ -824,35 +781,27 @@ def expand_tabs(self, tab_size: Optional[int] = None) -> None:
"""
if "\t" not in self.plain:
return
+ pos = 0
if tab_size is None:
tab_size = self.tab_size
- if tab_size is None:
- tab_size = 8
-
- new_text: List[Text] = []
- append = new_text.append
+ assert tab_size is not None
+ result = self.blank_copy()
+ append = result.append
+ _style = self.style
for line in self.split("\n", include_separator=True):
- if "\t" not in line.plain:
- append(line)
- else:
- cell_position = 0
- parts = line.split("\t", include_separator=True)
- for part in parts:
- if part.plain.endswith("\t"):
- part._text[-1] = part._text[-1][:-1] + " "
- cell_position += part.cell_len
- tab_remainder = cell_position % tab_size
- if tab_remainder:
- spaces = tab_size - tab_remainder
- part.extend_style(spaces)
- cell_position += spaces
- else:
- cell_position += part.cell_len
+ parts = line.split("\t", include_separator=True)
+ for part in parts:
+ if part.plain.endswith("\t"):
+ part._text = [part.plain[:-1] + " "]
+ append(part)
+ pos += len(part)
+ spaces = tab_size - ((pos - 1) % tab_size) - 1
+ if spaces:
+ append(" " * spaces, _style)
+ pos += spaces
+ else:
append(part)
-
- result = Text("").join(new_text)
-
self._text = [result.plain]
self._length = len(self.plain)
self._spans[:] = result._spans
@@ -903,7 +852,6 @@ def pad(self, count: int, character: str = " ") -> None:
Args:
count (int): Width of padding.
- character (str): The character to pad with. Must be a string of length 1.
"""
assert len(character) == 1, "Character must be a string of length 1"
if count:
@@ -984,7 +932,7 @@ def append(
self._text.append(sanitized_text)
offset = len(self)
text_length = len(sanitized_text)
- if style:
+ if style is not None:
self._spans.append(Span(offset, offset + text_length, style))
self._length += text_length
elif isinstance(text, Text):
@@ -994,14 +942,14 @@ def append(
"style must not be set when appending Text instance"
)
text_length = self._length
- if text.style:
+ if text.style is not None:
self._spans.append(
_Span(text_length, text_length + len(text), text.style)
)
self._text.append(text.plain)
self._spans.extend(
_Span(start + text_length, end + text_length, style)
- for start, end, style in text._spans.copy()
+ for start, end, style in text._spans
)
self._length += len(text)
return self
@@ -1010,20 +958,17 @@ def append_text(self, text: "Text") -> "Text":
"""Append another Text instance. This method is more performant that Text.append, but
only works for Text.
- Args:
- text (Text): The Text instance to append to this instance.
-
Returns:
Text: Returns self for chaining.
"""
_Span = Span
text_length = self._length
- if text.style:
+ if text.style is not None:
self._spans.append(_Span(text_length, text_length + len(text), text.style))
self._text.append(text.plain)
self._spans.extend(
_Span(start + text_length, end + text_length, style)
- for start, end, style in text._spans.copy()
+ for start, end, style in text._spans
)
self._length += len(text)
return self
@@ -1034,7 +979,7 @@ def append_tokens(
"""Append iterable of str and style. Style may be a Style instance or a str style definition.
Args:
- tokens (Iterable[Tuple[str, Optional[StyleType]]]): An iterable of tuples containing str content and style.
+ pairs (Iterable[Tuple[str, Optional[StyleType]]]): An iterable of tuples containing str content and style.
Returns:
Text: Returns self for chaining.
@@ -1044,9 +989,8 @@ def append_tokens(
_Span = Span
offset = len(self)
for content, style in tokens:
- content = strip_control_codes(content)
append_text(content)
- if style:
+ if style is not None:
append_span(_Span(offset, offset + len(content), style))
offset += len(content)
self._length = offset
@@ -1144,6 +1088,7 @@ def divide(self, offsets: Iterable[int]) -> Lines:
_Span = Span
for span_start, span_end, style in self._spans:
+
lower_bound = 0
upper_bound = line_count
start_line_no = (lower_bound + upper_bound) // 2
@@ -1213,7 +1158,8 @@ def wrap(
Args:
console (Console): Console instance.
- width (int): Number of cells available per line.
+ width (int): Number of characters per line.
+ emoji (bool, optional): Also render emoji code. Defaults to True.
justify (str, optional): Justify method: "default", "left", "center", "full", "right". Defaults to "default".
overflow (str, optional): Overflow method: "crop", "fold", or "ellipsis". Defaults to None.
tab_size (int, optional): Default tab size. Defaults to 8.
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/theme.py b/venv1/Lib/site-packages/pip/_vendor/rich/theme.py
index 227f1d86..471dfb2f 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/theme.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/theme.py
@@ -1,5 +1,5 @@
import configparser
-from typing import IO, Dict, List, Mapping, Optional
+from typing import Dict, List, IO, Mapping, Optional
from .default_styles import DEFAULT_STYLES
from .style import Style, StyleType
@@ -69,7 +69,7 @@ def read(
Returns:
Theme: A new theme instance.
"""
- with open(path, encoding=encoding) as config_file:
+ with open(path, "rt", encoding=encoding) as config_file:
return cls.from_file(config_file, source=path, inherit=inherit)
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/traceback.py b/venv1/Lib/site-packages/pip/_vendor/rich/traceback.py
index 01b2f502..c4ffe1f9 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/traceback.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/traceback.py
@@ -1,9 +1,10 @@
-import inspect
+from __future__ import absolute_import
+
import linecache
import os
+import platform
import sys
from dataclasses import dataclass, field
-from itertools import islice
from traceback import walk_tb
from types import ModuleType, TracebackType
from typing import (
@@ -14,7 +15,6 @@
List,
Optional,
Sequence,
- Set,
Tuple,
Type,
Union,
@@ -27,64 +27,28 @@
from pip._vendor.pygments.util import ClassNotFound
from . import pretty
-from ._loop import loop_first_last, loop_last
+from ._loop import loop_last
from .columns import Columns
-from .console import (
- Console,
- ConsoleOptions,
- ConsoleRenderable,
- Group,
- RenderResult,
- group,
-)
+from .console import Console, ConsoleOptions, ConsoleRenderable, RenderResult, group
from .constrain import Constrain
from .highlighter import RegexHighlighter, ReprHighlighter
from .panel import Panel
from .scope import render_scope
from .style import Style
-from .syntax import Syntax, SyntaxPosition
+from .syntax import Syntax
from .text import Text
from .theme import Theme
-WINDOWS = sys.platform == "win32"
+WINDOWS = platform.system() == "Windows"
LOCALS_MAX_LENGTH = 10
LOCALS_MAX_STRING = 80
-def _iter_syntax_lines(
- start: SyntaxPosition, end: SyntaxPosition
-) -> Iterable[Tuple[int, int, int]]:
- """Yield start and end positions per line.
-
- Args:
- start: Start position.
- end: End position.
-
- Returns:
- Iterable of (LINE, COLUMN1, COLUMN2).
- """
-
- line1, column1 = start
- line2, column2 = end
-
- if line1 == line2:
- yield line1, column1, column2
- else:
- for first, last, line_no in loop_first_last(range(line1, line2 + 1)):
- if first:
- yield line_no, column1, -1
- elif last:
- yield line_no, 0, column2
- else:
- yield line_no, 0, -1
-
-
def install(
*,
console: Optional[Console] = None,
width: Optional[int] = 100,
- code_width: Optional[int] = 88,
extra_lines: int = 3,
theme: Optional[str] = None,
word_wrap: bool = False,
@@ -105,7 +69,6 @@ def install(
Args:
console (Optional[Console], optional): Console to write exception to. Default uses internal Console instance.
width (Optional[int], optional): Width (in characters) of traceback. Defaults to 100.
- code_width (Optional[int], optional): Code width (in characters) of traceback. Defaults to 88.
extra_lines (int, optional): Extra lines of code. Defaults to 3.
theme (Optional[str], optional): Pygments theme to use in traceback. Defaults to ``None`` which will pick
a theme appropriate for the platform.
@@ -136,25 +99,25 @@ def excepthook(
value: BaseException,
traceback: Optional[TracebackType],
) -> None:
- exception_traceback = Traceback.from_exception(
- type_,
- value,
- traceback,
- width=width,
- code_width=code_width,
- extra_lines=extra_lines,
- theme=theme,
- word_wrap=word_wrap,
- show_locals=show_locals,
- locals_max_length=locals_max_length,
- locals_max_string=locals_max_string,
- locals_hide_dunder=locals_hide_dunder,
- locals_hide_sunder=bool(locals_hide_sunder),
- indent_guides=indent_guides,
- suppress=suppress,
- max_frames=max_frames,
+ traceback_console.print(
+ Traceback.from_exception(
+ type_,
+ value,
+ traceback,
+ width=width,
+ extra_lines=extra_lines,
+ theme=theme,
+ word_wrap=word_wrap,
+ show_locals=show_locals,
+ locals_max_length=locals_max_length,
+ locals_max_string=locals_max_string,
+ locals_hide_dunder=locals_hide_dunder,
+ locals_hide_sunder=bool(locals_hide_sunder),
+ indent_guides=indent_guides,
+ suppress=suppress,
+ max_frames=max_frames,
+ )
)
- traceback_console.print(exception_traceback)
def ipy_excepthook_closure(ip: Any) -> None: # pragma: no cover
tb_data = {} # store information about showtraceback call
@@ -178,9 +141,7 @@ def ipy_display_traceback(
# determine correct tb_offset
compiled = tb_data.get("running_compiled_code", False)
- tb_offset = tb_data.get("tb_offset")
- if tb_offset is None:
- tb_offset = 1 if compiled else 0
+ tb_offset = tb_data.get("tb_offset", 1 if compiled else 0)
# remove ipython internal frames from trace with tb_offset
for _ in range(tb_offset):
if tb is None:
@@ -218,7 +179,6 @@ class Frame:
name: str
line: str = ""
locals: Optional[Dict[str, pretty.Node]] = None
- last_instruction: Optional[Tuple[Tuple[int, int], Tuple[int, int]]] = None
@dataclass
@@ -228,7 +188,6 @@ class _SyntaxError:
line: str
lineno: int
msg: str
- notes: List[str] = field(default_factory=list)
@dataclass
@@ -238,9 +197,6 @@ class Stack:
syntax_error: Optional[_SyntaxError] = None
is_cause: bool = False
frames: List[Frame] = field(default_factory=list)
- notes: List[str] = field(default_factory=list)
- is_group: bool = False
- exceptions: List["Trace"] = field(default_factory=list)
@dataclass
@@ -259,7 +215,6 @@ class Traceback:
trace (Trace, optional): A `Trace` object produced from `extract`. Defaults to None, which uses
the last exception.
width (Optional[int], optional): Number of characters used to traceback. Defaults to 100.
- code_width (Optional[int], optional): Number of code characters used to traceback. Defaults to 88.
extra_lines (int, optional): Additional lines of code to render. Defaults to 3.
theme (str, optional): Override pygments theme used in traceback.
word_wrap (bool, optional): Enable word wrapping of long lines. Defaults to False.
@@ -288,7 +243,6 @@ def __init__(
trace: Optional[Trace] = None,
*,
width: Optional[int] = 100,
- code_width: Optional[int] = 88,
extra_lines: int = 3,
theme: Optional[str] = None,
word_wrap: bool = False,
@@ -312,7 +266,6 @@ def __init__(
)
self.trace = trace
self.width = width
- self.code_width = code_width
self.extra_lines = extra_lines
self.theme = Syntax.get_theme(theme or "ansi_dark")
self.word_wrap = word_wrap
@@ -344,7 +297,6 @@ def from_exception(
traceback: Optional[TracebackType],
*,
width: Optional[int] = 100,
- code_width: Optional[int] = 88,
extra_lines: int = 3,
theme: Optional[str] = None,
word_wrap: bool = False,
@@ -364,7 +316,6 @@ def from_exception(
exc_value (BaseException): Exception value.
traceback (TracebackType): Python Traceback object.
width (Optional[int], optional): Number of characters used to traceback. Defaults to 100.
- code_width (Optional[int], optional): Number of code characters used to traceback. Defaults to 88.
extra_lines (int, optional): Additional lines of code to render. Defaults to 3.
theme (str, optional): Override pygments theme used in traceback.
word_wrap (bool, optional): Enable word wrapping of long lines. Defaults to False.
@@ -395,7 +346,6 @@ def from_exception(
return cls(
rich_traceback,
width=width,
- code_width=code_width,
extra_lines=extra_lines,
theme=theme,
word_wrap=word_wrap,
@@ -421,7 +371,6 @@ def extract(
locals_max_string: int = LOCALS_MAX_STRING,
locals_hide_dunder: bool = True,
locals_hide_sunder: bool = False,
- _visited_exceptions: Optional[Set[BaseException]] = None,
) -> Trace:
"""Extract traceback information.
@@ -445,12 +394,6 @@ def extract(
from pip._vendor.rich import _IMPORT_CWD
- notes: List[str] = getattr(exc_value, "__notes__", None) or []
-
- grouped_exceptions: Set[BaseException] = (
- set() if _visited_exceptions is None else _visited_exceptions
- )
-
def safe_str(_object: Any) -> str:
"""Don't allow exceptions from __str__ to propagate."""
try:
@@ -463,29 +406,8 @@ def safe_str(_object: Any) -> str:
exc_type=safe_str(exc_type.__name__),
exc_value=safe_str(exc_value),
is_cause=is_cause,
- notes=notes,
)
- if sys.version_info >= (3, 11):
- if isinstance(exc_value, (BaseExceptionGroup, ExceptionGroup)):
- stack.is_group = True
- for exception in exc_value.exceptions:
- if exception in grouped_exceptions:
- continue
- grouped_exceptions.add(exception)
- stack.exceptions.append(
- Traceback.extract(
- type(exception),
- exception,
- exception.__traceback__,
- show_locals=show_locals,
- locals_max_length=locals_max_length,
- locals_hide_dunder=locals_hide_dunder,
- locals_hide_sunder=locals_hide_sunder,
- _visited_exceptions=grouped_exceptions,
- )
- )
-
if isinstance(exc_value, SyntaxError):
stack.syntax_error = _SyntaxError(
offset=exc_value.offset or 0,
@@ -493,14 +415,13 @@ def safe_str(_object: Any) -> str:
lineno=exc_value.lineno or 0,
line=exc_value.text or "",
msg=exc_value.msg,
- notes=notes,
)
stacks.append(stack)
append = stack.frames.append
def get_locals(
- iter_locals: Iterable[Tuple[str, object]],
+ iter_locals: Iterable[Tuple[str, object]]
) -> Iterable[Tuple[str, object]]:
"""Extract locals from an iterator of key pairs."""
if not (locals_hide_dunder or locals_hide_sunder):
@@ -515,35 +436,6 @@ def get_locals(
for frame_summary, line_no in walk_tb(traceback):
filename = frame_summary.f_code.co_filename
-
- last_instruction: Optional[Tuple[Tuple[int, int], Tuple[int, int]]]
- last_instruction = None
- if sys.version_info >= (3, 11):
- instruction_index = frame_summary.f_lasti // 2
- instruction_position = next(
- islice(
- frame_summary.f_code.co_positions(),
- instruction_index,
- instruction_index + 1,
- )
- )
- (
- start_line,
- end_line,
- start_column,
- end_column,
- ) = instruction_position
- if (
- start_line is not None
- and end_line is not None
- and start_column is not None
- and end_column is not None
- ):
- last_instruction = (
- (start_line, start_column),
- (end_line, end_column),
- )
-
if filename and not filename.startswith("<"):
if not os.path.isabs(filename):
filename = os.path.join(_IMPORT_CWD, filename)
@@ -554,50 +446,42 @@ def get_locals(
filename=filename or "?",
lineno=line_no,
name=frame_summary.f_code.co_name,
- locals=(
- {
- key: pretty.traverse(
- value,
- max_length=locals_max_length,
- max_string=locals_max_string,
- )
- for key, value in get_locals(frame_summary.f_locals.items())
- if not (inspect.isfunction(value) or inspect.isclass(value))
- }
- if show_locals
- else None
- ),
- last_instruction=last_instruction,
+ locals={
+ key: pretty.traverse(
+ value,
+ max_length=locals_max_length,
+ max_string=locals_max_string,
+ )
+ for key, value in get_locals(frame_summary.f_locals.items())
+ }
+ if show_locals
+ else None,
)
append(frame)
if frame_summary.f_locals.get("_rich_traceback_guard", False):
del stack.frames[:]
- if not grouped_exceptions:
- cause = getattr(exc_value, "__cause__", None)
- if cause is not None and cause is not exc_value:
- exc_type = cause.__class__
- exc_value = cause
- # __traceback__ can be None, e.g. for exceptions raised by the
- # 'multiprocessing' module
- traceback = cause.__traceback__
- is_cause = True
- continue
+ cause = getattr(exc_value, "__cause__", None)
+ if cause:
+ exc_type = cause.__class__
+ exc_value = cause
+ # __traceback__ can be None, e.g. for exceptions raised by the
+ # 'multiprocessing' module
+ traceback = cause.__traceback__
+ is_cause = True
+ continue
- cause = exc_value.__context__
- if cause is not None and not getattr(
- exc_value, "__suppress_context__", False
- ):
- exc_type = cause.__class__
- exc_value = cause
- traceback = cause.__traceback__
- is_cause = False
- continue
+ cause = exc_value.__context__
+ if cause and not getattr(exc_value, "__suppress_context__", False):
+ exc_type = cause.__class__
+ exc_value = cause
+ traceback = cause.__traceback__
+ is_cause = False
+ continue
# No cover, code is reached but coverage doesn't recognize it.
break # pragma: no cover
trace = Trace(stacks=stacks)
-
return trace
def __rich_console__(
@@ -630,9 +514,7 @@ def __rich_console__(
)
highlighter = ReprHighlighter()
-
- @group()
- def render_stack(stack: Stack, last: bool) -> RenderResult:
+ for last, stack in loop_last(reversed(self.trace.stacks)):
if stack.frames:
stack_renderable: ConsoleRenderable = Panel(
self._render_stack(stack),
@@ -645,7 +527,6 @@ def render_stack(stack: Stack, last: bool) -> RenderResult:
stack_renderable = Constrain(stack_renderable, self.width)
with console.use_theme(traceback_theme):
yield stack_renderable
-
if stack.syntax_error is not None:
with console.use_theme(traceback_theme):
yield Constrain(
@@ -671,24 +552,6 @@ def render_stack(stack: Stack, last: bool) -> RenderResult:
else:
yield Text.assemble((f"{stack.exc_type}", "traceback.exc_type"))
- for note in stack.notes:
- yield Text.assemble(("[NOTE] ", "traceback.note"), highlighter(note))
-
- if stack.is_group:
- for group_no, group_exception in enumerate(stack.exceptions, 1):
- grouped_exceptions: List[Group] = []
- for group_last, group_stack in loop_last(group_exception.stacks):
- grouped_exceptions.append(render_stack(group_stack, group_last))
- yield ""
- yield Constrain(
- Panel(
- Group(*grouped_exceptions),
- title=f"Sub-exception #{group_no}",
- border_style="traceback.group.border",
- ),
- self.width,
- )
-
if not last:
if stack.is_cause:
yield Text.from_markup(
@@ -699,9 +562,6 @@ def render_stack(stack: Stack, last: bool) -> RenderResult:
"\n[i]During handling of the above exception, another exception occurred:\n",
)
- for last, stack in loop_last(reversed(self.trace.stacks)):
- yield render_stack(stack, last)
-
@group()
def _render_syntax_error(self, syntax_error: _SyntaxError) -> RenderResult:
highlighter = ReprHighlighter()
@@ -746,6 +606,17 @@ def _render_stack(self, stack: Stack) -> RenderResult:
path_highlighter = PathHighlighter()
theme = self.theme
+ def read_code(filename: str) -> str:
+ """Read files, and cache results on filename.
+
+ Args:
+ filename (str): Filename to read
+
+ Returns:
+ str: Contents of file
+ """
+ return "".join(linecache.getlines(filename))
+
def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
if frame.locals:
yield render_scope(
@@ -765,6 +636,7 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
excluded = False
for frame_index, frame in enumerate(stack.frames):
+
if exclude_frames and frame_index in exclude_frames:
excluded = True
continue
@@ -807,8 +679,7 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
continue
if not suppressed:
try:
- code_lines = linecache.getlines(frame.filename)
- code = "".join(code_lines)
+ code = read_code(frame.filename)
if not code:
# code may be an empty string if the file doesn't exist, OR
# if the traceback filename is generated dynamically
@@ -825,7 +696,7 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
),
highlight_lines={frame.lineno},
word_wrap=self.word_wrap,
- code_width=self.code_width,
+ code_width=88,
indent_guides=self.indent_guides,
dedent=False,
)
@@ -835,28 +706,6 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
(f"\n{error}", "traceback.error"),
)
else:
- if frame.last_instruction is not None:
- start, end = frame.last_instruction
-
- # Stylize a line at a time
- # So that indentation isn't underlined (which looks bad)
- for line1, column1, column2 in _iter_syntax_lines(start, end):
- try:
- if column1 == 0:
- line = code_lines[line1 - 1]
- column1 = len(line) - len(line.lstrip())
- if column2 == -1:
- column2 = len(code_lines[line1 - 1])
- except IndexError:
- # Being defensive here
- # If last_instruction reports a line out-of-bounds, we don't want to crash
- continue
-
- syntax.stylize_range(
- style="traceback.error_range",
- start=(line1, column1),
- end=(line1, column2),
- )
yield (
Columns(
[
@@ -871,12 +720,13 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
if __name__ == "__main__": # pragma: no cover
- install(show_locals=True)
+
+ from .console import Console
+
+ console = Console()
import sys
- def bar(
- a: Any,
- ) -> None: # 这是对亚洲语言支持的测试。面对模棱两可的想法，拒绝猜测的诱惑
+ def bar(a: Any) -> None: # 这是对亚洲语言支持的测试。面对模棱两可的想法，拒绝猜测的诱惑
one = 1
print(one / a)
@@ -894,6 +744,13 @@ def foo(a: Any) -> None:
bar(a)
def error() -> None:
- foo(0)
+
+ try:
+ try:
+ foo(0)
+ except:
+ slfkjsldkfj # type: ignore[name-defined]
+ except:
+ console.print_exception(show_locals=True)
error()
diff --git a/venv1/Lib/site-packages/pip/_vendor/rich/tree.py b/venv1/Lib/site-packages/pip/_vendor/rich/tree.py
index 27c5cf7b..afe8da1a 100644
--- a/venv1/Lib/site-packages/pip/_vendor/rich/tree.py
+++ b/venv1/Lib/site-packages/pip/_vendor/rich/tree.py
@@ -8,32 +8,18 @@
from .style import Style, StyleStack, StyleType
from .styled import Styled
-GuideType = Tuple[str, str, str, str]
-
class Tree(JupyterMixin):
"""A renderable for a tree structure.
- Attributes:
- ASCII_GUIDES (GuideType): Guide lines used when Console.ascii_only is True.
- TREE_GUIDES (List[GuideType, GuideType, GuideType]): Default guide lines.
-
Args:
label (RenderableType): The renderable or str for the tree label.
style (StyleType, optional): Style of this tree. Defaults to "tree".
guide_style (StyleType, optional): Style of the guide lines. Defaults to "tree.line".
expanded (bool, optional): Also display children. Defaults to True.
highlight (bool, optional): Highlight renderable (if str). Defaults to False.
- hide_root (bool, optional): Hide the root node. Defaults to False.
"""
- ASCII_GUIDES = (" ", "| ", "+-- ", "`-- ")
- TREE_GUIDES = [
- (" ", "│ ", "├── ", "└── "),
- (" ", "┃ ", "┣━━ ", "┗━━ "),
- (" ", "║ ", "╠══ ", "╚══ "),
- ]
-
def __init__(
self,
label: RenderableType,
@@ -86,6 +72,7 @@ def add(
def __rich_console__(
self, console: "Console", options: "ConsoleOptions"
) -> "RenderResult":
+
stack: List[Iterator[Tuple[bool, Tree]]] = []
pop = stack.pop
push = stack.append
@@ -96,15 +83,21 @@ def __rich_console__(
guide_style = get_style(self.guide_style, default="") or null_style
SPACE, CONTINUE, FORK, END = range(4)
+ ASCII_GUIDES = (" ", "| ", "+-- ", "`-- ")
+ TREE_GUIDES = [
+ (" ", "│ ", "├── ", "└── "),
+ (" ", "┃ ", "┣━━ ", "┗━━ "),
+ (" ", "║ ", "╠══ ", "╚══ "),
+ ]
_Segment = Segment
def make_guide(index: int, style: Style) -> Segment:
"""Make a Segment for a level of the guide lines."""
if options.ascii_only:
- line = self.ASCII_GUIDES[index]
+ line = ASCII_GUIDES[index]
else:
guide = 1 if style.bold else (2 if style.underline2 else 0)
- line = self.TREE_GUIDES[0 if options.legacy_windows else guide][index]
+ line = TREE_GUIDES[0 if options.legacy_windows else guide][index]
return _Segment(line, style)
levels: List[Segment] = [make_guide(CONTINUE, guide_style)]
@@ -202,6 +195,7 @@ def __rich_measure__(
if __name__ == "__main__": # pragma: no cover
+
from pip._vendor.rich.console import Group
from pip._vendor.rich.markdown import Markdown
from pip._vendor.rich.panel import Panel
diff --git a/venv1/Lib/site-packages/pip/_vendor/tomli/__init__.py b/venv1/Lib/site-packages/pip/_vendor/tomli/__init__.py
index 9395b043..4c6ec97e 100644
--- a/venv1/Lib/site-packages/pip/_vendor/tomli/__init__.py
+++ b/venv1/Lib/site-packages/pip/_vendor/tomli/__init__.py
@@ -3,6 +3,9 @@
# Licensed to PSF under a Contributor Agreement.
__all__ = ("loads", "load", "TOMLDecodeError")
-__version__ = "2.3.0" # DO NOT EDIT THIS LINE MANUALLY. LET bump2version UTILITY DO IT
+__version__ = "2.0.1" # DO NOT EDIT THIS LINE MANUALLY. LET bump2version UTILITY DO IT
from ._parser import TOMLDecodeError, load, loads
+
+# Pretend this exception was created here.
+TOMLDecodeError.__module__ = __name__
diff --git a/venv1/Lib/site-packages/pip/_vendor/tomli/_parser.py b/venv1/Lib/site-packages/pip/_vendor/tomli/_parser.py
index 26170e8e..f1bb0aa1 100644
--- a/venv1/Lib/site-packages/pip/_vendor/tomli/_parser.py
+++ b/venv1/Lib/site-packages/pip/_vendor/tomli/_parser.py
@@ -4,8 +4,10 @@
from __future__ import annotations
-import sys
+from collections.abc import Iterable
+import string
from types import MappingProxyType
+from typing import Any, BinaryIO, NamedTuple
from ._re import (
RE_DATETIME,
@@ -15,125 +17,44 @@
match_to_localtime,
match_to_number,
)
+from ._types import Key, ParseFloat, Pos
-TYPE_CHECKING = False
-if TYPE_CHECKING:
- from collections.abc import Iterable
- from typing import IO, Any, Final
-
- from ._types import Key, ParseFloat, Pos
-
-# Inline tables/arrays are implemented using recursion. Pathologically
-# nested documents cause pure Python to raise RecursionError (which is OK),
-# but mypyc binary wheels will crash unrecoverably (not OK). According to
-# mypyc docs this will be fixed in the future:
-# https://mypyc.readthedocs.io/en/latest/differences_from_python.html#stack-overflows
-# Before mypyc's fix is in, recursion needs to be limited by this library.
-# Choosing `sys.getrecursionlimit()` as maximum inline table/array nesting
-# level, as it allows more nesting than pure Python, but still seems a far
-# lower number than where mypyc binaries crash.
-MAX_INLINE_NESTING: Final = sys.getrecursionlimit()
-
-ASCII_CTRL: Final = frozenset(chr(i) for i in range(32)) | frozenset(chr(127))
+ASCII_CTRL = frozenset(chr(i) for i in range(32)) | frozenset(chr(127))
# Neither of these sets include quotation mark or backslash. They are
# currently handled as separate cases in the parser functions.
-ILLEGAL_BASIC_STR_CHARS: Final = ASCII_CTRL - frozenset("\t")
-ILLEGAL_MULTILINE_BASIC_STR_CHARS: Final = ASCII_CTRL - frozenset("\t\n")
+ILLEGAL_BASIC_STR_CHARS = ASCII_CTRL - frozenset("\t")
+ILLEGAL_MULTILINE_BASIC_STR_CHARS = ASCII_CTRL - frozenset("\t\n")
-ILLEGAL_LITERAL_STR_CHARS: Final = ILLEGAL_BASIC_STR_CHARS
-ILLEGAL_MULTILINE_LITERAL_STR_CHARS: Final = ILLEGAL_MULTILINE_BASIC_STR_CHARS
+ILLEGAL_LITERAL_STR_CHARS = ILLEGAL_BASIC_STR_CHARS
+ILLEGAL_MULTILINE_LITERAL_STR_CHARS = ILLEGAL_MULTILINE_BASIC_STR_CHARS
-ILLEGAL_COMMENT_CHARS: Final = ILLEGAL_BASIC_STR_CHARS
+ILLEGAL_COMMENT_CHARS = ILLEGAL_BASIC_STR_CHARS
-TOML_WS: Final = frozenset(" \t")
-TOML_WS_AND_NEWLINE: Final = TOML_WS | frozenset("\n")
-BARE_KEY_CHARS: Final = frozenset(
- "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789" "-_"
-)
-KEY_INITIAL_CHARS: Final = BARE_KEY_CHARS | frozenset("\"'")
-HEXDIGIT_CHARS: Final = frozenset("abcdef" "ABCDEF" "0123456789")
+TOML_WS = frozenset(" \t")
+TOML_WS_AND_NEWLINE = TOML_WS | frozenset("\n")
+BARE_KEY_CHARS = frozenset(string.ascii_letters + string.digits + "-_")
+KEY_INITIAL_CHARS = BARE_KEY_CHARS | frozenset("\"'")
+HEXDIGIT_CHARS = frozenset(string.hexdigits)
-BASIC_STR_ESCAPE_REPLACEMENTS: Final = MappingProxyType(
+BASIC_STR_ESCAPE_REPLACEMENTS = MappingProxyType(
{
"\\b": "\u0008", # backspace
"\\t": "\u0009", # tab
- "\\n": "\u000a", # linefeed
- "\\f": "\u000c", # form feed
- "\\r": "\u000d", # carriage return
+ "\\n": "\u000A", # linefeed
+ "\\f": "\u000C", # form feed
+ "\\r": "\u000D", # carriage return
'\\"': "\u0022", # quote
- "\\\\": "\u005c", # backslash
+ "\\\\": "\u005C", # backslash
}
)
-class DEPRECATED_DEFAULT:
- """Sentinel to be used as default arg during deprecation
- period of TOMLDecodeError's free-form arguments."""
-
-
class TOMLDecodeError(ValueError):
- """An error raised if a document is not valid TOML.
-
- Adds the following attributes to ValueError:
- msg: The unformatted error message
- doc: The TOML document being parsed
- pos: The index of doc where parsing failed
- lineno: The line corresponding to pos
- colno: The column corresponding to pos
- """
-
- def __init__(
- self,
- msg: str | type[DEPRECATED_DEFAULT] = DEPRECATED_DEFAULT,
- doc: str | type[DEPRECATED_DEFAULT] = DEPRECATED_DEFAULT,
- pos: Pos | type[DEPRECATED_DEFAULT] = DEPRECATED_DEFAULT,
- *args: Any,
- ):
- if (
- args
- or not isinstance(msg, str)
- or not isinstance(doc, str)
- or not isinstance(pos, int)
- ):
- import warnings
-
- warnings.warn(
- "Free-form arguments for TOMLDecodeError are deprecated. "
- "Please set 'msg' (str), 'doc' (str) and 'pos' (int) arguments only.",
- DeprecationWarning,
- stacklevel=2,
- )
- if pos is not DEPRECATED_DEFAULT:
- args = pos, *args
- if doc is not DEPRECATED_DEFAULT:
- args = doc, *args
- if msg is not DEPRECATED_DEFAULT:
- args = msg, *args
- ValueError.__init__(self, *args)
- return
-
- lineno = doc.count("\n", 0, pos) + 1
- if lineno == 1:
- colno = pos + 1
- else:
- colno = pos - doc.rindex("\n", 0, pos)
-
- if pos >= len(doc):
- coord_repr = "end of document"
- else:
- coord_repr = f"line {lineno}, column {colno}"
- errmsg = f"{msg} (at {coord_repr})"
- ValueError.__init__(self, errmsg)
-
- self.msg = msg
- self.doc = doc
- self.pos = pos
- self.lineno = lineno
- self.colno = colno
+ """An error raised if a document is not valid TOML."""
-def load(__fp: IO[bytes], *, parse_float: ParseFloat = float) -> dict[str, Any]:
+def load(__fp: BinaryIO, *, parse_float: ParseFloat = float) -> dict[str, Any]:
"""Parse TOML from a binary file object."""
b = __fp.read()
try:
@@ -150,14 +71,9 @@ def loads(__s: str, *, parse_float: ParseFloat = float) -> dict[str, Any]: # no
# The spec allows converting "\r\n" to "\n", even in string
# literals. Let's do so to simplify parsing.
- try:
- src = __s.replace("\r\n", "\n")
- except (AttributeError, TypeError):
- raise TypeError(
- f"Expected str object, not '{type(__s).__qualname__}'"
- ) from None
+ src = __s.replace("\r\n", "\n")
pos = 0
- out = Output()
+ out = Output(NestedDict(), Flags())
header: Key = ()
parse_float = make_safe_parse_float(parse_float)
@@ -197,7 +113,7 @@ def loads(__s: str, *, parse_float: ParseFloat = float) -> dict[str, Any]: # no
pos, header = create_dict_rule(src, pos, out)
pos = skip_chars(src, pos, TOML_WS)
elif char != "#":
- raise TOMLDecodeError("Invalid statement", src, pos)
+ raise suffixed_err(src, pos, "Invalid statement")
# 3. Skip comment
pos = skip_comment(src, pos)
@@ -208,8 +124,8 @@ def loads(__s: str, *, parse_float: ParseFloat = float) -> dict[str, Any]: # no
except IndexError:
break
if char != "\n":
- raise TOMLDecodeError(
- "Expected newline or end of document after a statement", src, pos
+ raise suffixed_err(
+ src, pos, "Expected newline or end of document after a statement"
)
pos += 1
@@ -220,13 +136,13 @@ class Flags:
"""Flags that map to parsed keys/namespaces."""
# Marks an immutable namespace (inline array or inline table).
- FROZEN: Final = 0
+ FROZEN = 0
# Marks a nest that has been explicitly created and can no longer
# be opened using the "[table]" syntax.
- EXPLICIT_NEST: Final = 1
+ EXPLICIT_NEST = 1
def __init__(self) -> None:
- self._flags: dict[str, dict[Any, Any]] = {}
+ self._flags: dict[str, dict] = {}
self._pending_flags: set[tuple[Key, int]] = set()
def add_pending(self, key: Key, flag: int) -> None:
@@ -269,8 +185,8 @@ def is_(self, key: Key, flag: int) -> bool:
cont = inner_cont["nested"]
key_stem = key[-1]
if key_stem in cont:
- inner_cont = cont[key_stem]
- return flag in inner_cont["flags"] or flag in inner_cont["recursive_flags"]
+ cont = cont[key_stem]
+ return flag in cont["flags"] or flag in cont["recursive_flags"]
return False
@@ -284,7 +200,7 @@ def get_or_create_nest(
key: Key,
*,
access_lists: bool = True,
- ) -> dict[str, Any]:
+ ) -> dict:
cont: Any = self.dict
for k in key:
if k not in cont:
@@ -294,7 +210,7 @@ def get_or_create_nest(
cont = cont[-1]
if not isinstance(cont, dict):
raise KeyError("There is no nest behind this key")
- return cont # type: ignore[no-any-return]
+ return cont
def append_nest_to_list(self, key: Key) -> None:
cont = self.get_or_create_nest(key[:-1])
@@ -308,10 +224,9 @@ def append_nest_to_list(self, key: Key) -> None:
cont[last_key] = [{}]
-class Output:
- def __init__(self) -> None:
- self.data = NestedDict()
- self.flags = Flags()
+class Output(NamedTuple):
+ data: NestedDict
+ flags: Flags
def skip_chars(src: str, pos: Pos, chars: Iterable[str]) -> Pos:
@@ -336,12 +251,12 @@ def skip_until(
except ValueError:
new_pos = len(src)
if error_on_eof:
- raise TOMLDecodeError(f"Expected {expect!r}", src, new_pos) from None
+ raise suffixed_err(src, new_pos, f"Expected {expect!r}") from None
if not error_on.isdisjoint(src[pos:new_pos]):
while src[pos] not in error_on:
pos += 1
- raise TOMLDecodeError(f"Found invalid character {src[pos]!r}", src, pos)
+ raise suffixed_err(src, pos, f"Found invalid character {src[pos]!r}")
return new_pos
@@ -372,17 +287,15 @@ def create_dict_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
pos, key = parse_key(src, pos)
if out.flags.is_(key, Flags.EXPLICIT_NEST) or out.flags.is_(key, Flags.FROZEN):
- raise TOMLDecodeError(f"Cannot declare {key} twice", src, pos)
+ raise suffixed_err(src, pos, f"Cannot declare {key} twice")
out.flags.set(key, Flags.EXPLICIT_NEST, recursive=False)
try:
out.data.get_or_create_nest(key)
except KeyError:
- raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
+ raise suffixed_err(src, pos, "Cannot overwrite a value") from None
if not src.startswith("]", pos):
- raise TOMLDecodeError(
- "Expected ']' at the end of a table declaration", src, pos
- )
+ raise suffixed_err(src, pos, "Expected ']' at the end of a table declaration")
return pos + 1, key
@@ -392,7 +305,7 @@ def create_list_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
pos, key = parse_key(src, pos)
if out.flags.is_(key, Flags.FROZEN):
- raise TOMLDecodeError(f"Cannot mutate immutable namespace {key}", src, pos)
+ raise suffixed_err(src, pos, f"Cannot mutate immutable namespace {key}")
# Free the namespace now that it points to another empty list item...
out.flags.unset_all(key)
# ...but this key precisely is still prohibited from table declaration
@@ -400,19 +313,17 @@ def create_list_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
try:
out.data.append_nest_to_list(key)
except KeyError:
- raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
+ raise suffixed_err(src, pos, "Cannot overwrite a value") from None
if not src.startswith("]]", pos):
- raise TOMLDecodeError(
- "Expected ']]' at the end of an array declaration", src, pos
- )
+ raise suffixed_err(src, pos, "Expected ']]' at the end of an array declaration")
return pos + 2, key
def key_value_rule(
src: str, pos: Pos, out: Output, header: Key, parse_float: ParseFloat
) -> Pos:
- pos, key, value = parse_key_value_pair(src, pos, parse_float, nest_lvl=0)
+ pos, key, value = parse_key_value_pair(src, pos, parse_float)
key_parent, key_stem = key[:-1], key[-1]
abs_key_parent = header + key_parent
@@ -420,22 +331,22 @@ def key_value_rule(
for cont_key in relative_path_cont_keys:
# Check that dotted key syntax does not redefine an existing table
if out.flags.is_(cont_key, Flags.EXPLICIT_NEST):
- raise TOMLDecodeError(f"Cannot redefine namespace {cont_key}", src, pos)
+ raise suffixed_err(src, pos, f"Cannot redefine namespace {cont_key}")
# Containers in the relative path can't be opened with the table syntax or
# dotted key/value syntax in following table sections.
out.flags.add_pending(cont_key, Flags.EXPLICIT_NEST)
if out.flags.is_(abs_key_parent, Flags.FROZEN):
- raise TOMLDecodeError(
- f"Cannot mutate immutable namespace {abs_key_parent}", src, pos
+ raise suffixed_err(
+ src, pos, f"Cannot mutate immutable namespace {abs_key_parent}"
)
try:
nest = out.data.get_or_create_nest(abs_key_parent)
except KeyError:
- raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
+ raise suffixed_err(src, pos, "Cannot overwrite a value") from None
if key_stem in nest:
- raise TOMLDecodeError("Cannot overwrite a value", src, pos)
+ raise suffixed_err(src, pos, "Cannot overwrite a value")
# Mark inline table and array namespaces recursively immutable
if isinstance(value, (dict, list)):
out.flags.set(header + key, Flags.FROZEN, recursive=True)
@@ -444,7 +355,7 @@ def key_value_rule(
def parse_key_value_pair(
- src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
+ src: str, pos: Pos, parse_float: ParseFloat
) -> tuple[Pos, Key, Any]:
pos, key = parse_key(src, pos)
try:
@@ -452,10 +363,10 @@ def parse_key_value_pair(
except IndexError:
char = None
if char != "=":
- raise TOMLDecodeError("Expected '=' after a key in a key/value pair", src, pos)
+ raise suffixed_err(src, pos, "Expected '=' after a key in a key/value pair")
pos += 1
pos = skip_chars(src, pos, TOML_WS)
- pos, value = parse_value(src, pos, parse_float, nest_lvl)
+ pos, value = parse_value(src, pos, parse_float)
return pos, key, value
@@ -490,7 +401,7 @@ def parse_key_part(src: str, pos: Pos) -> tuple[Pos, str]:
return parse_literal_str(src, pos)
if char == '"':
return parse_one_line_basic_str(src, pos)
- raise TOMLDecodeError("Invalid initial character for a key part", src, pos)
+ raise suffixed_err(src, pos, "Invalid initial character for a key part")
def parse_one_line_basic_str(src: str, pos: Pos) -> tuple[Pos, str]:
@@ -498,17 +409,15 @@ def parse_one_line_basic_str(src: str, pos: Pos) -> tuple[Pos, str]:
return parse_basic_str(src, pos, multiline=False)
-def parse_array(
- src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
-) -> tuple[Pos, list[Any]]:
+def parse_array(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, list]:
pos += 1
- array: list[Any] = []
+ array: list = []
pos = skip_comments_and_array_ws(src, pos)
if src.startswith("]", pos):
return pos + 1, array
while True:
- pos, val = parse_value(src, pos, parse_float, nest_lvl)
+ pos, val = parse_value(src, pos, parse_float)
array.append(val)
pos = skip_comments_and_array_ws(src, pos)
@@ -516,7 +425,7 @@ def parse_array(
if c == "]":
return pos + 1, array
if c != ",":
- raise TOMLDecodeError("Unclosed array", src, pos)
+ raise suffixed_err(src, pos, "Unclosed array")
pos += 1
pos = skip_comments_and_array_ws(src, pos)
@@ -524,9 +433,7 @@ def parse_array(
return pos + 1, array
-def parse_inline_table(
- src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
-) -> tuple[Pos, dict[str, Any]]:
+def parse_inline_table(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, dict]:
pos += 1
nested_dict = NestedDict()
flags = Flags()
@@ -535,23 +442,23 @@ def parse_inline_table(
if src.startswith("}", pos):
return pos + 1, nested_dict.dict
while True:
- pos, key, value = parse_key_value_pair(src, pos, parse_float, nest_lvl)
+ pos, key, value = parse_key_value_pair(src, pos, parse_float)
key_parent, key_stem = key[:-1], key[-1]
if flags.is_(key, Flags.FROZEN):
- raise TOMLDecodeError(f"Cannot mutate immutable namespace {key}", src, pos)
+ raise suffixed_err(src, pos, f"Cannot mutate immutable namespace {key}")
try:
nest = nested_dict.get_or_create_nest(key_parent, access_lists=False)
except KeyError:
- raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
+ raise suffixed_err(src, pos, "Cannot overwrite a value") from None
if key_stem in nest:
- raise TOMLDecodeError(f"Duplicate inline table key {key_stem!r}", src, pos)
+ raise suffixed_err(src, pos, f"Duplicate inline table key {key_stem!r}")
nest[key_stem] = value
pos = skip_chars(src, pos, TOML_WS)
c = src[pos : pos + 1]
if c == "}":
return pos + 1, nested_dict.dict
if c != ",":
- raise TOMLDecodeError("Unclosed inline table", src, pos)
+ raise suffixed_err(src, pos, "Unclosed inline table")
if isinstance(value, (dict, list)):
flags.set(key, Flags.FROZEN, recursive=True)
pos += 1
@@ -573,7 +480,7 @@ def parse_basic_str_escape(
except IndexError:
return pos, ""
if char != "\n":
- raise TOMLDecodeError("Unescaped '\\' in a string", src, pos)
+ raise suffixed_err(src, pos, "Unescaped '\\' in a string")
pos += 1
pos = skip_chars(src, pos, TOML_WS_AND_NEWLINE)
return pos, ""
@@ -584,7 +491,7 @@ def parse_basic_str_escape(
try:
return pos, BASIC_STR_ESCAPE_REPLACEMENTS[escape_id]
except KeyError:
- raise TOMLDecodeError("Unescaped '\\' in a string", src, pos) from None
+ raise suffixed_err(src, pos, "Unescaped '\\' in a string") from None
def parse_basic_str_escape_multiline(src: str, pos: Pos) -> tuple[Pos, str]:
@@ -594,13 +501,11 @@ def parse_basic_str_escape_multiline(src: str, pos: Pos) -> tuple[Pos, str]:
def parse_hex_char(src: str, pos: Pos, hex_len: int) -> tuple[Pos, str]:
hex_str = src[pos : pos + hex_len]
if len(hex_str) != hex_len or not HEXDIGIT_CHARS.issuperset(hex_str):
- raise TOMLDecodeError("Invalid hex value", src, pos)
+ raise suffixed_err(src, pos, "Invalid hex value")
pos += hex_len
hex_int = int(hex_str, 16)
if not is_unicode_scalar_value(hex_int):
- raise TOMLDecodeError(
- "Escaped character is not a Unicode scalar value", src, pos
- )
+ raise suffixed_err(src, pos, "Escaped character is not a Unicode scalar value")
return pos, chr(hex_int)
@@ -657,7 +562,7 @@ def parse_basic_str(src: str, pos: Pos, *, multiline: bool) -> tuple[Pos, str]:
try:
char = src[pos]
except IndexError:
- raise TOMLDecodeError("Unterminated string", src, pos) from None
+ raise suffixed_err(src, pos, "Unterminated string") from None
if char == '"':
if not multiline:
return pos + 1, result + src[start_pos:pos]
@@ -672,21 +577,13 @@ def parse_basic_str(src: str, pos: Pos, *, multiline: bool) -> tuple[Pos, str]:
start_pos = pos
continue
if char in error_on:
- raise TOMLDecodeError(f"Illegal character {char!r}", src, pos)
+ raise suffixed_err(src, pos, f"Illegal character {char!r}")
pos += 1
def parse_value( # noqa: C901
- src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
+ src: str, pos: Pos, parse_float: ParseFloat
) -> tuple[Pos, Any]:
- if nest_lvl > MAX_INLINE_NESTING:
- # Pure Python should have raised RecursionError already.
- # This ensures mypyc binaries eventually do the same.
- raise RecursionError( # pragma: no cover
- "TOML inline arrays/tables are nested more than the allowed"
- f" {MAX_INLINE_NESTING} levels"
- )
-
try:
char: str | None = src[pos]
except IndexError:
@@ -716,11 +613,11 @@ def parse_value( # noqa: C901
# Arrays
if char == "[":
- return parse_array(src, pos, parse_float, nest_lvl + 1)
+ return parse_array(src, pos, parse_float)
# Inline tables
if char == "{":
- return parse_inline_table(src, pos, parse_float, nest_lvl + 1)
+ return parse_inline_table(src, pos, parse_float)
# Dates and times
datetime_match = RE_DATETIME.match(src, pos)
@@ -728,7 +625,7 @@ def parse_value( # noqa: C901
try:
datetime_obj = match_to_datetime(datetime_match)
except ValueError as e:
- raise TOMLDecodeError("Invalid date or datetime", src, pos) from e
+ raise suffixed_err(src, pos, "Invalid date or datetime") from e
return datetime_match.end(), datetime_obj
localtime_match = RE_LOCALTIME.match(src, pos)
if localtime_match:
@@ -749,7 +646,24 @@ def parse_value( # noqa: C901
if first_four in {"-inf", "+inf", "-nan", "+nan"}:
return pos + 4, parse_float(first_four)
- raise TOMLDecodeError("Invalid value", src, pos)
+ raise suffixed_err(src, pos, "Invalid value")
+
+
+def suffixed_err(src: str, pos: Pos, msg: str) -> TOMLDecodeError:
+ """Return a `TOMLDecodeError` where error message is suffixed with
+ coordinates in source."""
+
+ def coord_repr(src: str, pos: Pos) -> str:
+ if pos >= len(src):
+ return "end of document"
+ line = src.count("\n", 0, pos) + 1
+ if line == 1:
+ column = pos + 1
+ else:
+ column = pos - src.rindex("\n", 0, pos)
+ return f"line {line}, column {column}"
+
+ return TOMLDecodeError(f"{msg} (at {coord_repr(src, pos)})")
def is_unicode_scalar_value(codepoint: int) -> bool:
@@ -765,7 +679,7 @@ def make_safe_parse_float(parse_float: ParseFloat) -> ParseFloat:
instead of returning illegal types.
"""
# The default `float` callable never returns illegal types. Optimize it.
- if parse_float is float:
+ if parse_float is float: # type: ignore[comparison-overlap]
return float
def safe_parse_float(float_str: str) -> Any:
diff --git a/venv1/Lib/site-packages/pip/_vendor/tomli/_re.py b/venv1/Lib/site-packages/pip/_vendor/tomli/_re.py
index c159dcfa..994bb749 100644
--- a/venv1/Lib/site-packages/pip/_vendor/tomli/_re.py
+++ b/venv1/Lib/site-packages/pip/_vendor/tomli/_re.py
@@ -7,21 +7,16 @@
from datetime import date, datetime, time, timedelta, timezone, tzinfo
from functools import lru_cache
import re
+from typing import Any
-TYPE_CHECKING = False
-if TYPE_CHECKING:
- from typing import Any, Final
-
- from ._types import ParseFloat
+from ._types import ParseFloat
# E.g.
# - 00:32:00.999999
# - 00:32:00
-_TIME_RE_STR: Final = (
- r"([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(?:\.([0-9]{1,6})[0-9]*)?"
-)
+_TIME_RE_STR = r"([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(?:\.([0-9]{1,6})[0-9]*)?"
-RE_NUMBER: Final = re.compile(
+RE_NUMBER = re.compile(
r"""
0
(?:
@@ -40,8 +35,8 @@
""",
flags=re.VERBOSE,
)
-RE_LOCALTIME: Final = re.compile(_TIME_RE_STR)
-RE_DATETIME: Final = re.compile(
+RE_LOCALTIME = re.compile(_TIME_RE_STR)
+RE_DATETIME = re.compile(
rf"""
([0-9]{{4}})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01]) # date, e.g. 1988-10-27
(?:
@@ -54,7 +49,7 @@
)
-def match_to_datetime(match: re.Match[str]) -> datetime | date:
+def match_to_datetime(match: re.Match) -> datetime | date:
"""Convert a `RE_DATETIME` match to `datetime.datetime` or `datetime.date`.
Raises ValueError if the match does not correspond to a valid date
@@ -89,9 +84,6 @@ def match_to_datetime(match: re.Match[str]) -> datetime | date:
return datetime(year, month, day, hour, minute, sec, micros, tzinfo=tz)
-# No need to limit cache size. This is only ever called on input
-# that matched RE_DATETIME, so there is an implicit bound of
-# 24 (hours) * 60 (minutes) * 2 (offset direction) = 2880.
@lru_cache(maxsize=None)
def cached_tz(hour_str: str, minute_str: str, sign_str: str) -> timezone:
sign = 1 if sign_str == "+" else -1
@@ -103,13 +95,13 @@ def cached_tz(hour_str: str, minute_str: str, sign_str: str) -> timezone:
)
-def match_to_localtime(match: re.Match[str]) -> time:
+def match_to_localtime(match: re.Match) -> time:
hour_str, minute_str, sec_str, micros_str = match.groups()
micros = int(micros_str.ljust(6, "0")) if micros_str else 0
return time(int(hour_str), int(minute_str), int(sec_str), micros)
-def match_to_number(match: re.Match[str], parse_float: ParseFloat) -> Any:
+def match_to_number(match: re.Match, parse_float: ParseFloat) -> Any:
if match.group("floatpart"):
return parse_float(match.group())
return int(match.group(), 0)
diff --git a/venv1/Lib/site-packages/pip/_vendor/tomli/py.typed b/venv1/Lib/site-packages/pip/_vendor/tomli/py.typed
deleted file mode 100644
index 7632ecf7..00000000
--- a/venv1/Lib/site-packages/pip/_vendor/tomli/py.typed
+++ /dev/null
@@ -1 +0,0 @@
-# Marker file for PEP 561
diff --git a/venv1/Lib/site-packages/pip/_vendor/truststore/__init__.py b/venv1/Lib/site-packages/pip/_vendor/truststore/__init__.py
deleted file mode 100644
index 0166459b..00000000
--- a/venv1/Lib/site-packages/pip/_vendor/truststore/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""Verify certificates using native system trust stores"""
-
-import sys as _sys
-
-if _sys.version_info < (3, 10):
- raise ImportError("truststore requires Python 3.10 or later")
-
-# Detect Python runtimes which don't implement SSLObject.get_unverified_chain() API
-# This API only became public in Python 3.13 but was available in CPython and PyPy since 3.10.
-if _sys.version_info < (3, 13) and _sys.implementation.name not in ("cpython", "pypy"):
- try:
- import ssl as _ssl
- except ImportError:
- raise ImportError("truststore requires the 'ssl' module")
- else:
- _sslmem = _ssl.MemoryBIO()
- _sslobj = _ssl.create_default_context().wrap_bio(
- _sslmem,
- _sslmem,
- )
- try:
- while not hasattr(_sslobj, "get_unverified_chain"):
- _sslobj = _sslobj._sslobj # type: ignore[attr-defined]
- except AttributeError:
- raise ImportError(
- "truststore requires peer certificate chain APIs to be available"
- ) from None
-
- del _ssl, _sslobj, _sslmem # noqa: F821
-
-from ._api import SSLContext, extract_from_ssl, inject_into_ssl # noqa: E402
-
-del _api, _sys # type: ignore[name-defined] # noqa: F821
-
-__all__ = ["SSLContext", "inject_into_ssl", "extract_from_ssl"]
-__version__ = "0.10.4"
diff --git a/venv1/Lib/site-packages/pip/_vendor/truststore/_api.py b/venv1/Lib/site-packages/pip/_vendor/truststore/_api.py
deleted file mode 100644
index a54ff9f2..00000000
--- a/venv1/Lib/site-packages/pip/_vendor/truststore/_api.py
+++ /dev/null
@@ -1,341 +0,0 @@
-import contextlib
-import os
-import platform
-import socket
-import ssl
-import sys
-import threading
-import typing
-
-import _ssl
-
-from ._ssl_constants import (
- _original_SSLContext,
- _original_super_SSLContext,
- _truststore_SSLContext_dunder_class,
- _truststore_SSLContext_super_class,
-)
-
-if platform.system() == "Windows":
- from ._windows import _configure_context, _verify_peercerts_impl
-elif platform.system() == "Darwin":
- from ._macos import _configure_context, _verify_peercerts_impl
-else:
- from ._openssl import _configure_context, _verify_peercerts_impl
-
-if typing.TYPE_CHECKING:
- from typing_extensions import Buffer
-
-# From typeshed/stdlib/ssl.pyi
-_StrOrBytesPath: typing.TypeAlias = str | bytes | os.PathLike[str] | os.PathLike[bytes]
-_PasswordType: typing.TypeAlias = str | bytes | typing.Callable[[], str | bytes]
-
-
-def inject_into_ssl() -> None:
- """Injects the :class:`truststore.SSLContext` into the ``ssl``
- module by replacing :class:`ssl.SSLContext`.
- """
- setattr(ssl, "SSLContext", SSLContext)
- # urllib3 holds on to its own reference of ssl.SSLContext
- # so we need to replace that reference too.
- try:
- import pip._vendor.urllib3.util.ssl_ as urllib3_ssl
-
- setattr(urllib3_ssl, "SSLContext", SSLContext)
- except ImportError:
- pass
-
- # requests starting with 2.32.0 added a preloaded SSL context to improve concurrent performance;
- # this unfortunately leads to a RecursionError, which can be avoided by patching the preloaded SSL context with
- # the truststore patched instance
- # also see https://github.com/psf/requests/pull/6667
- try:
- from pip._vendor.requests import adapters as requests_adapters
-
- preloaded_context = getattr(requests_adapters, "_preloaded_ssl_context", None)
- if preloaded_context is not None:
- setattr(
- requests_adapters,
- "_preloaded_ssl_context",
- SSLContext(ssl.PROTOCOL_TLS_CLIENT),
- )
- except ImportError:
- pass
-
-
-def extract_from_ssl() -> None:
- """Restores the :class:`ssl.SSLContext` class to its original state"""
- setattr(ssl, "SSLContext", _original_SSLContext)
- try:
- import pip._vendor.urllib3.util.ssl_ as urllib3_ssl
-
- urllib3_ssl.SSLContext = _original_SSLContext
- except ImportError:
- pass
-
-
-class SSLContext(_truststore_SSLContext_super_class): # type: ignore[misc]
- """SSLContext API that uses system certificates on all platforms"""
-
- @property # type: ignore[misc]
- def __class__(self) -> type:
- # Dirty hack to get around isinstance() checks
- # for ssl.SSLContext instances in aiohttp/trustme
- # when using non-CPython implementations.
- return _truststore_SSLContext_dunder_class or SSLContext
-
- def __init__(self, protocol: int = None) -> None: # type: ignore[assignment]
- self._ctx = _original_SSLContext(protocol)
- self._ctx_lock = threading.Lock()
-
- class TruststoreSSLObject(ssl.SSLObject):
- # This object exists because wrap_bio() doesn't
- # immediately do the handshake so we need to do
- # certificate verifications after SSLObject.do_handshake()
-
- def do_handshake(self) -> None:
- ret = super().do_handshake()
- _verify_peercerts(self, server_hostname=self.server_hostname)
- return ret
-
- self._ctx.sslobject_class = TruststoreSSLObject
-
- def wrap_socket(
- self,
- sock: socket.socket,
- server_side: bool = False,
- do_handshake_on_connect: bool = True,
- suppress_ragged_eofs: bool = True,
- server_hostname: str | None = None,
- session: ssl.SSLSession | None = None,
- ) -> ssl.SSLSocket:
-
- # We need to lock around the .__enter__()
- # but we don't need to lock within the
- # context manager, so we need to expand the
- # syntactic sugar of the `with` statement.
- with contextlib.ExitStack() as stack:
- with self._ctx_lock:
- stack.enter_context(_configure_context(self._ctx))
-
- ssl_sock = self._ctx.wrap_socket(
- sock,
- server_side=server_side,
- server_hostname=server_hostname,
- do_handshake_on_connect=do_handshake_on_connect,
- suppress_ragged_eofs=suppress_ragged_eofs,
- session=session,
- )
- try:
- _verify_peercerts(ssl_sock, server_hostname=server_hostname)
- except Exception:
- ssl_sock.close()
- raise
- return ssl_sock
-
- def wrap_bio(
- self,
- incoming: ssl.MemoryBIO,
- outgoing: ssl.MemoryBIO,
- server_side: bool = False,
- server_hostname: str | None = None,
- session: ssl.SSLSession | None = None,
- ) -> ssl.SSLObject:
- with _configure_context(self._ctx):
- ssl_obj = self._ctx.wrap_bio(
- incoming,
- outgoing,
- server_hostname=server_hostname,
- server_side=server_side,
- session=session,
- )
- return ssl_obj
-
- def load_verify_locations(
- self,
- cafile: str | bytes | os.PathLike[str] | os.PathLike[bytes] | None = None,
- capath: str | bytes | os.PathLike[str] | os.PathLike[bytes] | None = None,
- cadata: typing.Union[str, "Buffer", None] = None,
- ) -> None:
- return self._ctx.load_verify_locations(
- cafile=cafile, capath=capath, cadata=cadata
- )
-
- def load_cert_chain(
- self,
- certfile: _StrOrBytesPath,
- keyfile: _StrOrBytesPath | None = None,
- password: _PasswordType | None = None,
- ) -> None:
- return self._ctx.load_cert_chain(
- certfile=certfile, keyfile=keyfile, password=password
- )
-
- def load_default_certs(
- self, purpose: ssl.Purpose = ssl.Purpose.SERVER_AUTH
- ) -> None:
- return self._ctx.load_default_certs(purpose)
-
- def set_alpn_protocols(self, alpn_protocols: typing.Iterable[str]) -> None:
- return self._ctx.set_alpn_protocols(alpn_protocols)
-
- def set_npn_protocols(self, npn_protocols: typing.Iterable[str]) -> None:
- return self._ctx.set_npn_protocols(npn_protocols)
-
- def set_ciphers(self, __cipherlist: str) -> None:
- return self._ctx.set_ciphers(__cipherlist)
-
- def get_ciphers(self) -> typing.Any:
- return self._ctx.get_ciphers()
-
- def session_stats(self) -> dict[str, int]:
- return self._ctx.session_stats()
-
- def cert_store_stats(self) -> dict[str, int]:
- raise NotImplementedError()
-
- def set_default_verify_paths(self) -> None:
- self._ctx.set_default_verify_paths()
-
- @typing.overload
- def get_ca_certs(
- self, binary_form: typing.Literal[False] = ...
- ) -> list[typing.Any]: ...
-
- @typing.overload
- def get_ca_certs(self, binary_form: typing.Literal[True] = ...) -> list[bytes]: ...
-
- @typing.overload
- def get_ca_certs(self, binary_form: bool = ...) -> typing.Any: ...
-
- def get_ca_certs(self, binary_form: bool = False) -> list[typing.Any] | list[bytes]:
- raise NotImplementedError()
-
- @property
- def check_hostname(self) -> bool:
- return self._ctx.check_hostname
-
- @check_hostname.setter
- def check_hostname(self, value: bool) -> None:
- self._ctx.check_hostname = value
-
- @property
- def hostname_checks_common_name(self) -> bool:
- return self._ctx.hostname_checks_common_name
-
- @hostname_checks_common_name.setter
- def hostname_checks_common_name(self, value: bool) -> None:
- self._ctx.hostname_checks_common_name = value
-
- @property
- def keylog_filename(self) -> str:
- return self._ctx.keylog_filename
-
- @keylog_filename.setter
- def keylog_filename(self, value: str) -> None:
- self._ctx.keylog_filename = value
-
- @property
- def maximum_version(self) -> ssl.TLSVersion:
- return self._ctx.maximum_version
-
- @maximum_version.setter
- def maximum_version(self, value: ssl.TLSVersion) -> None:
- _original_super_SSLContext.maximum_version.__set__( # type: ignore[attr-defined]
- self._ctx, value
- )
-
- @property
- def minimum_version(self) -> ssl.TLSVersion:
- return self._ctx.minimum_version
-
- @minimum_version.setter
- def minimum_version(self, value: ssl.TLSVersion) -> None:
- _original_super_SSLContext.minimum_version.__set__( # type: ignore[attr-defined]
- self._ctx, value
- )
-
- @property
- def options(self) -> ssl.Options:
- return self._ctx.options
-
- @options.setter
- def options(self, value: ssl.Options) -> None:
- _original_super_SSLContext.options.__set__( # type: ignore[attr-defined]
- self._ctx, value
- )
-
- @property
- def post_handshake_auth(self) -> bool:
- return self._ctx.post_handshake_auth
-
- @post_handshake_auth.setter
- def post_handshake_auth(self, value: bool) -> None:
- self._ctx.post_handshake_auth = value
-
- @property
- def protocol(self) -> ssl._SSLMethod:
- return self._ctx.protocol
-
- @property
- def security_level(self) -> int:
- return self._ctx.security_level
-
- @property
- def verify_flags(self) -> ssl.VerifyFlags:
- return self._ctx.verify_flags
-
- @verify_flags.setter
- def verify_flags(self, value: ssl.VerifyFlags) -> None:
- _original_super_SSLContext.verify_flags.__set__( # type: ignore[attr-defined]
- self._ctx, value
- )
-
- @property
- def verify_mode(self) -> ssl.VerifyMode:
- return self._ctx.verify_mode
-
- @verify_mode.setter
- def verify_mode(self, value: ssl.VerifyMode) -> None:
- _original_super_SSLContext.verify_mode.__set__( # type: ignore[attr-defined]
- self._ctx, value
- )
-
-
-# Python 3.13+ makes get_unverified_chain() a public API that only returns DER
-# encoded certificates. We detect whether we need to call public_bytes() for 3.10->3.12
-# Pre-3.13 returned None instead of an empty list from get_unverified_chain()
-if sys.version_info >= (3, 13):
-
- def _get_unverified_chain_bytes(sslobj: ssl.SSLObject) -> list[bytes]:
- unverified_chain = sslobj.get_unverified_chain() or ()
- return [
- cert if isinstance(cert, bytes) else cert.public_bytes(_ssl.ENCODING_DER)
- for cert in unverified_chain
- ]
-
-else:
-
- def _get_unverified_chain_bytes(sslobj: ssl.SSLObject) -> list[bytes]:
- unverified_chain = sslobj.get_unverified_chain() or () # type: ignore[attr-defined]
- return [cert.public_bytes(_ssl.ENCODING_DER) for cert in unverified_chain]
-
-
-def _verify_peercerts(
- sock_or_sslobj: ssl.SSLSocket | ssl.SSLObject, server_hostname: str | None
-) -> None:
- """
- Verifies the peer certificates from an SSLSocket or SSLObject
- against the certificates in the OS trust store.
- """
- sslobj: ssl.SSLObject = sock_or_sslobj # type: ignore[assignment]
- try:
- while not hasattr(sslobj, "get_unverified_chain"):
- sslobj = sslobj._sslobj # type: ignore[attr-defined]
- except AttributeError:
- pass
-
- cert_bytes = _get_unverified_chain_bytes(sslobj)
- _verify_peercerts_impl(
- sock_or_sslobj.context, cert_bytes, server_hostname=server_hostname
- )
diff --git a/venv1/Lib/site-packages/pip/_vendor/truststore/_macos.py b/venv1/Lib/site-packages/pip/_vendor/truststore/_macos.py
deleted file mode 100644
index 34503077..00000000
--- a/venv1/Lib/site-packages/pip/_vendor/truststore/_macos.py
+++ /dev/null
@@ -1,571 +0,0 @@
-import contextlib
-import ctypes
-import platform
-import ssl
-import typing
-from ctypes import (
- CDLL,
- POINTER,
- c_bool,
- c_char_p,
- c_int32,
- c_long,
- c_uint32,
- c_ulong,
- c_void_p,
-)
-from ctypes.util import find_library
-
-from ._ssl_constants import _set_ssl_context_verify_mode
-
-_mac_version = platform.mac_ver()[0]
-_mac_version_info = tuple(map(int, _mac_version.split(".")))
-if _mac_version_info < (10, 8):
- raise ImportError(
- f"Only OS X 10.8 and newer are supported, not {_mac_version_info[0]}.{_mac_version_info[1]}"
- )
-
-_is_macos_version_10_14_or_later = _mac_version_info >= (10, 14)
-
-
-def _load_cdll(name: str, macos10_16_path: str) -> CDLL:
- """Loads a CDLL by name, falling back to known path on 10.16+"""
- try:
- # Big Sur is technically 11 but we use 10.16 due to the Big Sur
- # beta being labeled as 10.16.
- path: str | None
- if _mac_version_info >= (10, 16):
- path = macos10_16_path
- else:
- path = find_library(name)
- if not path:
- raise OSError # Caught and reraised as 'ImportError'
- return CDLL(path, use_errno=True)
- except OSError:
- raise ImportError(f"The library {name} failed to load") from None
-
-
-Security = _load_cdll(
- "Security", "/System/Library/Frameworks/Security.framework/Security"
-)
-CoreFoundation = _load_cdll(
- "CoreFoundation",
- "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation",
-)
-
-Boolean = c_bool
-CFIndex = c_long
-CFStringEncoding = c_uint32
-CFData = c_void_p
-CFString = c_void_p
-CFArray = c_void_p
-CFMutableArray = c_void_p
-CFError = c_void_p
-CFType = c_void_p
-CFTypeID = c_ulong
-CFTypeRef = POINTER(CFType)
-CFAllocatorRef = c_void_p
-
-OSStatus = c_int32
-
-CFErrorRef = POINTER(CFError)
-CFDataRef = POINTER(CFData)
-CFStringRef = POINTER(CFString)
-CFArrayRef = POINTER(CFArray)
-CFMutableArrayRef = POINTER(CFMutableArray)
-CFArrayCallBacks = c_void_p
-CFOptionFlags = c_uint32
-
-SecCertificateRef = POINTER(c_void_p)
-SecPolicyRef = POINTER(c_void_p)
-SecTrustRef = POINTER(c_void_p)
-SecTrustResultType = c_uint32
-SecTrustOptionFlags = c_uint32
-
-try:
- Security.SecCertificateCreateWithData.argtypes = [CFAllocatorRef, CFDataRef]
- Security.SecCertificateCreateWithData.restype = SecCertificateRef
-
- Security.SecCertificateCopyData.argtypes = [SecCertificateRef]
- Security.SecCertificateCopyData.restype = CFDataRef
-
- Security.SecCopyErrorMessageString.argtypes = [OSStatus, c_void_p]
- Security.SecCopyErrorMessageString.restype = CFStringRef
-
- Security.SecTrustSetAnchorCertificates.argtypes = [SecTrustRef, CFArrayRef]
- Security.SecTrustSetAnchorCertificates.restype = OSStatus
-
- Security.SecTrustSetAnchorCertificatesOnly.argtypes = [SecTrustRef, Boolean]
- Security.SecTrustSetAnchorCertificatesOnly.restype = OSStatus
-
- Security.SecPolicyCreateRevocation.argtypes = [CFOptionFlags]
- Security.SecPolicyCreateRevocation.restype = SecPolicyRef
-
- Security.SecPolicyCreateSSL.argtypes = [Boolean, CFStringRef]
- Security.SecPolicyCreateSSL.restype = SecPolicyRef
-
- Security.SecTrustCreateWithCertificates.argtypes = [
- CFTypeRef,
- CFTypeRef,
- POINTER(SecTrustRef),
- ]
- Security.SecTrustCreateWithCertificates.restype = OSStatus
-
- Security.SecTrustGetTrustResult.argtypes = [
- SecTrustRef,
- POINTER(SecTrustResultType),
- ]
- Security.SecTrustGetTrustResult.restype = OSStatus
-
- Security.SecTrustEvaluate.argtypes = [
- SecTrustRef,
- POINTER(SecTrustResultType),
- ]
- Security.SecTrustEvaluate.restype = OSStatus
-
- Security.SecTrustRef = SecTrustRef # type: ignore[attr-defined]
- Security.SecTrustResultType = SecTrustResultType # type: ignore[attr-defined]
- Security.OSStatus = OSStatus # type: ignore[attr-defined]
-
- kSecRevocationUseAnyAvailableMethod = 3
- kSecRevocationRequirePositiveResponse = 8
-
- CoreFoundation.CFRelease.argtypes = [CFTypeRef]
- CoreFoundation.CFRelease.restype = None
-
- CoreFoundation.CFGetTypeID.argtypes = [CFTypeRef]
- CoreFoundation.CFGetTypeID.restype = CFTypeID
-
- CoreFoundation.CFStringCreateWithCString.argtypes = [
- CFAllocatorRef,
- c_char_p,
- CFStringEncoding,
- ]
- CoreFoundation.CFStringCreateWithCString.restype = CFStringRef
-
- CoreFoundation.CFStringGetCStringPtr.argtypes = [CFStringRef, CFStringEncoding]
- CoreFoundation.CFStringGetCStringPtr.restype = c_char_p
-
- CoreFoundation.CFStringGetCString.argtypes = [
- CFStringRef,
- c_char_p,
- CFIndex,
- CFStringEncoding,
- ]
- CoreFoundation.CFStringGetCString.restype = c_bool
-
- CoreFoundation.CFDataCreate.argtypes = [CFAllocatorRef, c_char_p, CFIndex]
- CoreFoundation.CFDataCreate.restype = CFDataRef
-
- CoreFoundation.CFDataGetLength.argtypes = [CFDataRef]
- CoreFoundation.CFDataGetLength.restype = CFIndex
-
- CoreFoundation.CFDataGetBytePtr.argtypes = [CFDataRef]
- CoreFoundation.CFDataGetBytePtr.restype = c_void_p
-
- CoreFoundation.CFArrayCreate.argtypes = [
- CFAllocatorRef,
- POINTER(CFTypeRef),
- CFIndex,
- CFArrayCallBacks,
- ]
- CoreFoundation.CFArrayCreate.restype = CFArrayRef
-
- CoreFoundation.CFArrayCreateMutable.argtypes = [
- CFAllocatorRef,
- CFIndex,
- CFArrayCallBacks,
- ]
- CoreFoundation.CFArrayCreateMutable.restype = CFMutableArrayRef
-
- CoreFoundation.CFArrayAppendValue.argtypes = [CFMutableArrayRef, c_void_p]
- CoreFoundation.CFArrayAppendValue.restype = None
-
- CoreFoundation.CFArrayGetCount.argtypes = [CFArrayRef]
- CoreFoundation.CFArrayGetCount.restype = CFIndex
-
- CoreFoundation.CFArrayGetValueAtIndex.argtypes = [CFArrayRef, CFIndex]
- CoreFoundation.CFArrayGetValueAtIndex.restype = c_void_p
-
- CoreFoundation.CFErrorGetCode.argtypes = [CFErrorRef]
- CoreFoundation.CFErrorGetCode.restype = CFIndex
-
- CoreFoundation.CFErrorCopyDescription.argtypes = [CFErrorRef]
- CoreFoundation.CFErrorCopyDescription.restype = CFStringRef
-
- CoreFoundation.kCFAllocatorDefault = CFAllocatorRef.in_dll( # type: ignore[attr-defined]
- CoreFoundation, "kCFAllocatorDefault"
- )
- CoreFoundation.kCFTypeArrayCallBacks = c_void_p.in_dll( # type: ignore[attr-defined]
- CoreFoundation, "kCFTypeArrayCallBacks"
- )
-
- CoreFoundation.CFTypeRef = CFTypeRef # type: ignore[attr-defined]
- CoreFoundation.CFArrayRef = CFArrayRef # type: ignore[attr-defined]
- CoreFoundation.CFStringRef = CFStringRef # type: ignore[attr-defined]
- CoreFoundation.CFErrorRef = CFErrorRef # type: ignore[attr-defined]
-
-except AttributeError as e:
- raise ImportError(f"Error initializing ctypes: {e}") from None
-
-# SecTrustEvaluateWithError is macOS 10.14+
-if _is_macos_version_10_14_or_later:
- try:
- Security.SecTrustEvaluateWithError.argtypes = [
- SecTrustRef,
- POINTER(CFErrorRef),
- ]
- Security.SecTrustEvaluateWithError.restype = c_bool
- except AttributeError as e:
- raise ImportError(f"Error initializing ctypes: {e}") from None
-
-
-def _handle_osstatus(result: OSStatus, _: typing.Any, args: typing.Any) -> typing.Any:
- """
- Raises an error if the OSStatus value is non-zero.
- """
- if int(result) == 0:
- return args
-
- # Returns a CFString which we need to transform
- # into a UTF-8 Python string.
- error_message_cfstring = None
- try:
- error_message_cfstring = Security.SecCopyErrorMessageString(result, None)
-
- # First step is convert the CFString into a C string pointer.
- # We try the fast no-copy way first.
- error_message_cfstring_c_void_p = ctypes.cast(
- error_message_cfstring, ctypes.POINTER(ctypes.c_void_p)
- )
- message = CoreFoundation.CFStringGetCStringPtr(
- error_message_cfstring_c_void_p, CFConst.kCFStringEncodingUTF8
- )
-
- # Quoting the Apple dev docs:
- #
- # "A pointer to a C string or NULL if the internal
- # storage of theString does not allow this to be
- # returned efficiently."
- #
- # So we need to get our hands dirty.
- if message is None:
- buffer = ctypes.create_string_buffer(1024)
- result = CoreFoundation.CFStringGetCString(
- error_message_cfstring_c_void_p,
- buffer,
- 1024,
- CFConst.kCFStringEncodingUTF8,
- )
- if not result:
- raise OSError("Error copying C string from CFStringRef")
- message = buffer.value
-
- finally:
- if error_message_cfstring is not None:
- CoreFoundation.CFRelease(error_message_cfstring)
-
- # If no message can be found for this status we come
- # up with a generic one that forwards the status code.
- if message is None or message == "":
- message = f"SecureTransport operation returned a non-zero OSStatus: {result}"
-
- raise ssl.SSLError(message)
-
-
-Security.SecTrustCreateWithCertificates.errcheck = _handle_osstatus # type: ignore[assignment]
-Security.SecTrustSetAnchorCertificates.errcheck = _handle_osstatus # type: ignore[assignment]
-Security.SecTrustSetAnchorCertificatesOnly.errcheck = _handle_osstatus # type: ignore[assignment]
-Security.SecTrustGetTrustResult.errcheck = _handle_osstatus # type: ignore[assignment]
-Security.SecTrustEvaluate.errcheck = _handle_osstatus # type: ignore[assignment]
-
-
-class CFConst:
- """CoreFoundation constants"""
-
- kCFStringEncodingUTF8 = CFStringEncoding(0x08000100)
-
- errSecIncompleteCertRevocationCheck = -67635
- errSecHostNameMismatch = -67602
- errSecCertificateExpired = -67818
- errSecNotTrusted = -67843
-
-
-def _bytes_to_cf_data_ref(value: bytes) -> CFDataRef: # type: ignore[valid-type]
- return CoreFoundation.CFDataCreate( # type: ignore[no-any-return]
- CoreFoundation.kCFAllocatorDefault, value, len(value)
- )
-
-
-def _bytes_to_cf_string(value: bytes) -> CFString:
- """
- Given a Python binary data, create a CFString.
- The string must be CFReleased by the caller.
- """
- c_str = ctypes.c_char_p(value)
- cf_str = CoreFoundation.CFStringCreateWithCString(
- CoreFoundation.kCFAllocatorDefault,
- c_str,
- CFConst.kCFStringEncodingUTF8,
- )
- return cf_str # type: ignore[no-any-return]
-
-
-def _cf_string_ref_to_str(cf_string_ref: CFStringRef) -> str | None: # type: ignore[valid-type]
- """
- Creates a Unicode string from a CFString object. Used entirely for error
- reporting.
- Yes, it annoys me quite a lot that this function is this complex.
- """
-
- string = CoreFoundation.CFStringGetCStringPtr(
- cf_string_ref, CFConst.kCFStringEncodingUTF8
- )
- if string is None:
- buffer = ctypes.create_string_buffer(1024)
- result = CoreFoundation.CFStringGetCString(
- cf_string_ref, buffer, 1024, CFConst.kCFStringEncodingUTF8
- )
- if not result:
- raise OSError("Error copying C string from CFStringRef")
- string = buffer.value
- if string is not None:
- string = string.decode("utf-8")
- return string # type: ignore[no-any-return]
-
-
-def _der_certs_to_cf_cert_array(certs: list[bytes]) -> CFMutableArrayRef: # type: ignore[valid-type]
- """Builds a CFArray of SecCertificateRefs from a list of DER-encoded certificates.
- Responsibility of the caller to call CoreFoundation.CFRelease on the CFArray.
- """
- cf_array = CoreFoundation.CFArrayCreateMutable(
- CoreFoundation.kCFAllocatorDefault,
- 0,
- ctypes.byref(CoreFoundation.kCFTypeArrayCallBacks),
- )
- if not cf_array:
- raise MemoryError("Unable to allocate memory!")
-
- for cert_data in certs:
- cf_data = None
- sec_cert_ref = None
- try:
- cf_data = _bytes_to_cf_data_ref(cert_data)
- sec_cert_ref = Security.SecCertificateCreateWithData(
- CoreFoundation.kCFAllocatorDefault, cf_data
- )
- CoreFoundation.CFArrayAppendValue(cf_array, sec_cert_ref)
- finally:
- if cf_data:
- CoreFoundation.CFRelease(cf_data)
- if sec_cert_ref:
- CoreFoundation.CFRelease(sec_cert_ref)
-
- return cf_array # type: ignore[no-any-return]
-
-
-@contextlib.contextmanager
-def _configure_context(ctx: ssl.SSLContext) -> typing.Iterator[None]:
- check_hostname = ctx.check_hostname
- verify_mode = ctx.verify_mode
- ctx.check_hostname = False
- _set_ssl_context_verify_mode(ctx, ssl.CERT_NONE)
- try:
- yield
- finally:
- ctx.check_hostname = check_hostname
- _set_ssl_context_verify_mode(ctx, verify_mode)
-
-
-def _verify_peercerts_impl(
- ssl_context: ssl.SSLContext,
- cert_chain: list[bytes],
- server_hostname: str | None = None,
-) -> None:
- certs = None
- policies = None
- trust = None
- try:
- # Only set a hostname on the policy if we're verifying the hostname
- # on the leaf certificate.
- if server_hostname is not None and ssl_context.check_hostname:
- cf_str_hostname = None
- try:
- cf_str_hostname = _bytes_to_cf_string(server_hostname.encode("ascii"))
- ssl_policy = Security.SecPolicyCreateSSL(True, cf_str_hostname)
- finally:
- if cf_str_hostname:
- CoreFoundation.CFRelease(cf_str_hostname)
- else:
- ssl_policy = Security.SecPolicyCreateSSL(True, None)
-
- policies = ssl_policy
- if ssl_context.verify_flags & ssl.VERIFY_CRL_CHECK_CHAIN:
- # Add explicit policy requiring positive revocation checks
- policies = CoreFoundation.CFArrayCreateMutable(
- CoreFoundation.kCFAllocatorDefault,
- 0,
- ctypes.byref(CoreFoundation.kCFTypeArrayCallBacks),
- )
- CoreFoundation.CFArrayAppendValue(policies, ssl_policy)
- CoreFoundation.CFRelease(ssl_policy)
- revocation_policy = Security.SecPolicyCreateRevocation(
- kSecRevocationUseAnyAvailableMethod
- | kSecRevocationRequirePositiveResponse
- )
- CoreFoundation.CFArrayAppendValue(policies, revocation_policy)
- CoreFoundation.CFRelease(revocation_policy)
- elif ssl_context.verify_flags & ssl.VERIFY_CRL_CHECK_LEAF:
- raise NotImplementedError("VERIFY_CRL_CHECK_LEAF not implemented for macOS")
-
- certs = None
- try:
- certs = _der_certs_to_cf_cert_array(cert_chain)
-
- # Now that we have certificates loaded and a SecPolicy
- # we can finally create a SecTrust object!
- trust = Security.SecTrustRef()
- Security.SecTrustCreateWithCertificates(
- certs, policies, ctypes.byref(trust)
- )
-
- finally:
- # The certs are now being held by SecTrust so we can
- # release our handles for the array.
- if certs:
- CoreFoundation.CFRelease(certs)
-
- # If there are additional trust anchors to load we need to transform
- # the list of DER-encoded certificates into a CFArray.
- ctx_ca_certs_der: list[bytes] | None = ssl_context.get_ca_certs(
- binary_form=True
- )
- if ctx_ca_certs_der:
- ctx_ca_certs = None
- try:
- ctx_ca_certs = _der_certs_to_cf_cert_array(ctx_ca_certs_der)
- Security.SecTrustSetAnchorCertificates(trust, ctx_ca_certs)
- finally:
- if ctx_ca_certs:
- CoreFoundation.CFRelease(ctx_ca_certs)
-
- # We always want system certificates.
- Security.SecTrustSetAnchorCertificatesOnly(trust, False)
-
- # macOS 10.13 and earlier don't support SecTrustEvaluateWithError()
- # so we use SecTrustEvaluate() which means we need to construct error
- # messages ourselves.
- if _is_macos_version_10_14_or_later:
- _verify_peercerts_impl_macos_10_14(ssl_context, trust)
- else:
- _verify_peercerts_impl_macos_10_13(ssl_context, trust)
- finally:
- if policies:
- CoreFoundation.CFRelease(policies)
- if trust:
- CoreFoundation.CFRelease(trust)
-
-
-def _verify_peercerts_impl_macos_10_13(
- ssl_context: ssl.SSLContext, sec_trust_ref: typing.Any
-) -> None:
- """Verify using 'SecTrustEvaluate' API for macOS 10.13 and earlier.
- macOS 10.14 added the 'SecTrustEvaluateWithError' API.
- """
- sec_trust_result_type = Security.SecTrustResultType()
- Security.SecTrustEvaluate(sec_trust_ref, ctypes.byref(sec_trust_result_type))
-
- try:
- sec_trust_result_type_as_int = int(sec_trust_result_type.value)
- except (ValueError, TypeError):
- sec_trust_result_type_as_int = -1
-
- # Apple doesn't document these values in their own API docs.
- # See: https://github.com/xybp888/iOS-SDKs/blob/master/iPhoneOS13.0.sdk/System/Library/Frameworks/Security.framework/Headers/SecTrust.h#L84
- if (
- ssl_context.verify_mode == ssl.CERT_REQUIRED
- and sec_trust_result_type_as_int not in (1, 4)
- ):
- # Note that we're not able to ignore only hostname errors
- # for macOS 10.13 and earlier, so check_hostname=False will
- # still return an error.
- sec_trust_result_type_to_message = {
- 0: "Invalid trust result type",
- # 1: "Trust evaluation succeeded",
- 2: "User confirmation required",
- 3: "User specified that certificate is not trusted",
- # 4: "Trust result is unspecified",
- 5: "Recoverable trust failure occurred",
- 6: "Fatal trust failure occurred",
- 7: "Other error occurred, certificate may be revoked",
- }
- error_message = sec_trust_result_type_to_message.get(
- sec_trust_result_type_as_int,
- f"Unknown trust result: {sec_trust_result_type_as_int}",
- )
-
- err = ssl.SSLCertVerificationError(error_message)
- err.verify_message = error_message
- err.verify_code = sec_trust_result_type_as_int
- raise err
-
-
-def _verify_peercerts_impl_macos_10_14(
- ssl_context: ssl.SSLContext, sec_trust_ref: typing.Any
-) -> None:
- """Verify using 'SecTrustEvaluateWithError' API for macOS 10.14+."""
- cf_error = CoreFoundation.CFErrorRef()
- sec_trust_eval_result = Security.SecTrustEvaluateWithError(
- sec_trust_ref, ctypes.byref(cf_error)
- )
- # sec_trust_eval_result is a bool (0 or 1)
- # where 1 means that the certs are trusted.
- if sec_trust_eval_result == 1:
- is_trusted = True
- elif sec_trust_eval_result == 0:
- is_trusted = False
- else:
- raise ssl.SSLError(
- f"Unknown result from Security.SecTrustEvaluateWithError: {sec_trust_eval_result!r}"
- )
-
- cf_error_code = 0
- if not is_trusted:
- cf_error_code = CoreFoundation.CFErrorGetCode(cf_error)
-
- # If the error is a known failure that we're
- # explicitly okay with from SSLContext configuration
- # we can set is_trusted accordingly.
- if ssl_context.verify_mode != ssl.CERT_REQUIRED and (
- cf_error_code == CFConst.errSecNotTrusted
- or cf_error_code == CFConst.errSecCertificateExpired
- ):
- is_trusted = True
-
- # If we're still not trusted then we start to
- # construct and raise the SSLCertVerificationError.
- if not is_trusted:
- cf_error_string_ref = None
- try:
- cf_error_string_ref = CoreFoundation.CFErrorCopyDescription(cf_error)
-
- # Can this ever return 'None' if there's a CFError?
- cf_error_message = (
- _cf_string_ref_to_str(cf_error_string_ref)
- or "Certificate verification failed"
- )
-
- # TODO: Not sure if we need the SecTrustResultType for anything?
- # We only care whether or not it's a success or failure for now.
- sec_trust_result_type = Security.SecTrustResultType()
- Security.SecTrustGetTrustResult(
- sec_trust_ref, ctypes.byref(sec_trust_result_type)
- )
-
- err = ssl.SSLCertVerificationError(cf_error_message)
- err.verify_message = cf_error_message
- err.verify_code = cf_error_code
- raise err
- finally:
- if cf_error_string_ref:
- CoreFoundation.CFRelease(cf_error_string_ref)
diff --git a/venv1/Lib/site-packages/pip/_vendor/truststore/_openssl.py b/venv1/Lib/site-packages/pip/_vendor/truststore/_openssl.py
deleted file mode 100644
index 3e25a567..00000000
--- a/venv1/Lib/site-packages/pip/_vendor/truststore/_openssl.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import contextlib
-import os
-import re
-import ssl
-import typing
-
-# candidates based on https://github.com/tiran/certifi-system-store by Christian Heimes
-_CA_FILE_CANDIDATES = [
- # Alpine, Arch, Fedora 34-42, OpenWRT, RHEL 9-10, BSD
- "/etc/ssl/cert.pem",
- # Fedora 43+, RHEL 11+
- "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem",
- # Fedora <= 34, RHEL <= 9, CentOS <= 9
- "/etc/pki/tls/cert.pem",
- # Debian, Ubuntu (requires ca-certificates)
- "/etc/ssl/certs/ca-certificates.crt",
- # SUSE
- "/etc/ssl/ca-bundle.pem",
-]
-
-_HASHED_CERT_FILENAME_RE = re.compile(r"^[0-9a-fA-F]{8}\.[0-9]$")
-
-
-@contextlib.contextmanager
-def _configure_context(ctx: ssl.SSLContext) -> typing.Iterator[None]:
- # First, check whether the default locations from OpenSSL
- # seem like they will give us a usable set of CA certs.
- # ssl.get_default_verify_paths already takes care of:
- # - getting cafile from either the SSL_CERT_FILE env var
- # or the path configured when OpenSSL was compiled,
- # and verifying that that path exists
- # - getting capath from either the SSL_CERT_DIR env var
- # or the path configured when OpenSSL was compiled,
- # and verifying that that path exists
- # In addition we'll check whether capath appears to contain certs.
- defaults = ssl.get_default_verify_paths()
- if defaults.cafile or (defaults.capath and _capath_contains_certs(defaults.capath)):
- ctx.set_default_verify_paths()
- else:
- # cafile from OpenSSL doesn't exist
- # and capath from OpenSSL doesn't contain certs.
- # Let's search other common locations instead.
- for cafile in _CA_FILE_CANDIDATES:
- if os.path.isfile(cafile):
- ctx.load_verify_locations(cafile=cafile)
- break
-
- yield
-
-
-def _capath_contains_certs(capath: str) -> bool:
- """Check whether capath exists and contains certs in the expected format."""
- if not os.path.isdir(capath):
- return False
- for name in os.listdir(capath):
- if _HASHED_CERT_FILENAME_RE.match(name):
- return True
- return False
-
-
-def _verify_peercerts_impl(
- ssl_context: ssl.SSLContext,
- cert_chain: list[bytes],
- server_hostname: str | None = None,
-) -> None:
- # This is a no-op because we've enabled SSLContext's built-in
- # verification via verify_mode=CERT_REQUIRED, and don't need to repeat it.
- pass
diff --git a/venv1/Lib/site-packages/pip/_vendor/truststore/_ssl_constants.py b/venv1/Lib/site-packages/pip/_vendor/truststore/_ssl_constants.py
deleted file mode 100644
index b1ee7a3c..00000000
--- a/venv1/Lib/site-packages/pip/_vendor/truststore/_ssl_constants.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import ssl
-import sys
-import typing
-
-# Hold on to the original class so we can create it consistently
-# even if we inject our own SSLContext into the ssl module.
-_original_SSLContext = ssl.SSLContext
-_original_super_SSLContext = super(_original_SSLContext, _original_SSLContext)
-
-# CPython is known to be good, but non-CPython implementations
-# may implement SSLContext differently so to be safe we don't
-# subclass the SSLContext.
-
-# This is returned by truststore.SSLContext.__class__()
-_truststore_SSLContext_dunder_class: typing.Optional[type]
-
-# This value is the superclass of truststore.SSLContext.
-_truststore_SSLContext_super_class: type
-
-if sys.implementation.name == "cpython":
- _truststore_SSLContext_super_class = _original_SSLContext
- _truststore_SSLContext_dunder_class = None
-else:
- _truststore_SSLContext_super_class = object
- _truststore_SSLContext_dunder_class = _original_SSLContext
-
-
-def _set_ssl_context_verify_mode(
- ssl_context: ssl.SSLContext, verify_mode: ssl.VerifyMode
-) -> None:
- _original_super_SSLContext.verify_mode.__set__(ssl_context, verify_mode) # type: ignore[attr-defined]
diff --git a/venv1/Lib/site-packages/pip/_vendor/truststore/_windows.py b/venv1/Lib/site-packages/pip/_vendor/truststore/_windows.py
deleted file mode 100644
index a9bf9abd..00000000
--- a/venv1/Lib/site-packages/pip/_vendor/truststore/_windows.py
+++ /dev/null
@@ -1,567 +0,0 @@
-import contextlib
-import ssl
-import typing
-from ctypes import WinDLL # type: ignore
-from ctypes import WinError # type: ignore
-from ctypes import (
- POINTER,
- Structure,
- c_char_p,
- c_ulong,
- c_void_p,
- c_wchar_p,
- cast,
- create_unicode_buffer,
- pointer,
- sizeof,
-)
-from ctypes.wintypes import (
- BOOL,
- DWORD,
- HANDLE,
- LONG,
- LPCSTR,
- LPCVOID,
- LPCWSTR,
- LPFILETIME,
- LPSTR,
- LPWSTR,
-)
-from typing import TYPE_CHECKING, Any
-
-from ._ssl_constants import _set_ssl_context_verify_mode
-
-HCERTCHAINENGINE = HANDLE
-HCERTSTORE = HANDLE
-HCRYPTPROV_LEGACY = HANDLE
-
-
-class CERT_CONTEXT(Structure):
- _fields_ = (
- ("dwCertEncodingType", DWORD),
- ("pbCertEncoded", c_void_p),
- ("cbCertEncoded", DWORD),
- ("pCertInfo", c_void_p),
- ("hCertStore", HCERTSTORE),
- )
-
-
-PCERT_CONTEXT = POINTER(CERT_CONTEXT)
-PCCERT_CONTEXT = POINTER(PCERT_CONTEXT)
-
-
-class CERT_ENHKEY_USAGE(Structure):
- _fields_ = (
- ("cUsageIdentifier", DWORD),
- ("rgpszUsageIdentifier", POINTER(LPSTR)),
- )
-
-
-PCERT_ENHKEY_USAGE = POINTER(CERT_ENHKEY_USAGE)
-
-
-class CERT_USAGE_MATCH(Structure):
- _fields_ = (
- ("dwType", DWORD),
- ("Usage", CERT_ENHKEY_USAGE),
- )
-
-
-class CERT_CHAIN_PARA(Structure):
- _fields_ = (
- ("cbSize", DWORD),
- ("RequestedUsage", CERT_USAGE_MATCH),
- ("RequestedIssuancePolicy", CERT_USAGE_MATCH),
- ("dwUrlRetrievalTimeout", DWORD),
- ("fCheckRevocationFreshnessTime", BOOL),
- ("dwRevocationFreshnessTime", DWORD),
- ("pftCacheResync", LPFILETIME),
- ("pStrongSignPara", c_void_p),
- ("dwStrongSignFlags", DWORD),
- )
-
-
-if TYPE_CHECKING:
- PCERT_CHAIN_PARA = pointer[CERT_CHAIN_PARA] # type: ignore[misc]
-else:
- PCERT_CHAIN_PARA = POINTER(CERT_CHAIN_PARA)
-
-
-class CERT_TRUST_STATUS(Structure):
- _fields_ = (
- ("dwErrorStatus", DWORD),
- ("dwInfoStatus", DWORD),
- )
-
-
-class CERT_CHAIN_ELEMENT(Structure):
- _fields_ = (
- ("cbSize", DWORD),
- ("pCertContext", PCERT_CONTEXT),
- ("TrustStatus", CERT_TRUST_STATUS),
- ("pRevocationInfo", c_void_p),
- ("pIssuanceUsage", PCERT_ENHKEY_USAGE),
- ("pApplicationUsage", PCERT_ENHKEY_USAGE),
- ("pwszExtendedErrorInfo", LPCWSTR),
- )
-
-
-PCERT_CHAIN_ELEMENT = POINTER(CERT_CHAIN_ELEMENT)
-
-
-class CERT_SIMPLE_CHAIN(Structure):
- _fields_ = (
- ("cbSize", DWORD),
- ("TrustStatus", CERT_TRUST_STATUS),
- ("cElement", DWORD),
- ("rgpElement", POINTER(PCERT_CHAIN_ELEMENT)),
- ("pTrustListInfo", c_void_p),
- ("fHasRevocationFreshnessTime", BOOL),
- ("dwRevocationFreshnessTime", DWORD),
- )
-
-
-PCERT_SIMPLE_CHAIN = POINTER(CERT_SIMPLE_CHAIN)
-
-
-class CERT_CHAIN_CONTEXT(Structure):
- _fields_ = (
- ("cbSize", DWORD),
- ("TrustStatus", CERT_TRUST_STATUS),
- ("cChain", DWORD),
- ("rgpChain", POINTER(PCERT_SIMPLE_CHAIN)),
- ("cLowerQualityChainContext", DWORD),
- ("rgpLowerQualityChainContext", c_void_p),
- ("fHasRevocationFreshnessTime", BOOL),
- ("dwRevocationFreshnessTime", DWORD),
- )
-
-
-PCERT_CHAIN_CONTEXT = POINTER(CERT_CHAIN_CONTEXT)
-PCCERT_CHAIN_CONTEXT = POINTER(PCERT_CHAIN_CONTEXT)
-
-
-class SSL_EXTRA_CERT_CHAIN_POLICY_PARA(Structure):
- _fields_ = (
- ("cbSize", DWORD),
- ("dwAuthType", DWORD),
- ("fdwChecks", DWORD),
- ("pwszServerName", LPCWSTR),
- )
-
-
-class CERT_CHAIN_POLICY_PARA(Structure):
- _fields_ = (
- ("cbSize", DWORD),
- ("dwFlags", DWORD),
- ("pvExtraPolicyPara", c_void_p),
- )
-
-
-PCERT_CHAIN_POLICY_PARA = POINTER(CERT_CHAIN_POLICY_PARA)
-
-
-class CERT_CHAIN_POLICY_STATUS(Structure):
- _fields_ = (
- ("cbSize", DWORD),
- ("dwError", DWORD),
- ("lChainIndex", LONG),
- ("lElementIndex", LONG),
- ("pvExtraPolicyStatus", c_void_p),
- )
-
-
-PCERT_CHAIN_POLICY_STATUS = POINTER(CERT_CHAIN_POLICY_STATUS)
-
-
-class CERT_CHAIN_ENGINE_CONFIG(Structure):
- _fields_ = (
- ("cbSize", DWORD),
- ("hRestrictedRoot", HCERTSTORE),
- ("hRestrictedTrust", HCERTSTORE),
- ("hRestrictedOther", HCERTSTORE),
- ("cAdditionalStore", DWORD),
- ("rghAdditionalStore", c_void_p),
- ("dwFlags", DWORD),
- ("dwUrlRetrievalTimeout", DWORD),
- ("MaximumCachedCertificates", DWORD),
- ("CycleDetectionModulus", DWORD),
- ("hExclusiveRoot", HCERTSTORE),
- ("hExclusiveTrustedPeople", HCERTSTORE),
- ("dwExclusiveFlags", DWORD),
- )
-
-
-PCERT_CHAIN_ENGINE_CONFIG = POINTER(CERT_CHAIN_ENGINE_CONFIG)
-PHCERTCHAINENGINE = POINTER(HCERTCHAINENGINE)
-
-X509_ASN_ENCODING = 0x00000001
-PKCS_7_ASN_ENCODING = 0x00010000
-CERT_STORE_PROV_MEMORY = b"Memory"
-CERT_STORE_ADD_USE_EXISTING = 2
-USAGE_MATCH_TYPE_OR = 1
-OID_PKIX_KP_SERVER_AUTH = c_char_p(b"1.3.6.1.5.5.7.3.1")
-CERT_CHAIN_REVOCATION_CHECK_END_CERT = 0x10000000
-CERT_CHAIN_REVOCATION_CHECK_CHAIN = 0x20000000
-CERT_CHAIN_POLICY_IGNORE_ALL_NOT_TIME_VALID_FLAGS = 0x00000007
-CERT_CHAIN_POLICY_IGNORE_INVALID_BASIC_CONSTRAINTS_FLAG = 0x00000008
-CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG = 0x00000010
-CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG = 0x00000040
-CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG = 0x00000020
-CERT_CHAIN_POLICY_IGNORE_INVALID_POLICY_FLAG = 0x00000080
-CERT_CHAIN_POLICY_IGNORE_ALL_REV_UNKNOWN_FLAGS = 0x00000F00
-CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG = 0x00008000
-CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG = 0x00004000
-SECURITY_FLAG_IGNORE_CERT_CN_INVALID = 0x00001000
-AUTHTYPE_SERVER = 2
-CERT_CHAIN_POLICY_SSL = 4
-FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000
-FORMAT_MESSAGE_IGNORE_INSERTS = 0x00000200
-
-# Flags to set for SSLContext.verify_mode=CERT_NONE
-CERT_CHAIN_POLICY_VERIFY_MODE_NONE_FLAGS = (
- CERT_CHAIN_POLICY_IGNORE_ALL_NOT_TIME_VALID_FLAGS
- | CERT_CHAIN_POLICY_IGNORE_INVALID_BASIC_CONSTRAINTS_FLAG
- | CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG
- | CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG
- | CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG
- | CERT_CHAIN_POLICY_IGNORE_INVALID_POLICY_FLAG
- | CERT_CHAIN_POLICY_IGNORE_ALL_REV_UNKNOWN_FLAGS
- | CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG
- | CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG
-)
-
-wincrypt = WinDLL("crypt32.dll")
-kernel32 = WinDLL("kernel32.dll")
-
-
-def _handle_win_error(result: bool, _: Any, args: Any) -> Any:
- if not result:
- # Note, actually raises OSError after calling GetLastError and FormatMessage
- raise WinError()
- return args
-
-
-CertCreateCertificateChainEngine = wincrypt.CertCreateCertificateChainEngine
-CertCreateCertificateChainEngine.argtypes = (
- PCERT_CHAIN_ENGINE_CONFIG,
- PHCERTCHAINENGINE,
-)
-CertCreateCertificateChainEngine.errcheck = _handle_win_error
-
-CertOpenStore = wincrypt.CertOpenStore
-CertOpenStore.argtypes = (LPCSTR, DWORD, HCRYPTPROV_LEGACY, DWORD, c_void_p)
-CertOpenStore.restype = HCERTSTORE
-CertOpenStore.errcheck = _handle_win_error
-
-CertAddEncodedCertificateToStore = wincrypt.CertAddEncodedCertificateToStore
-CertAddEncodedCertificateToStore.argtypes = (
- HCERTSTORE,
- DWORD,
- c_char_p,
- DWORD,
- DWORD,
- PCCERT_CONTEXT,
-)
-CertAddEncodedCertificateToStore.restype = BOOL
-
-CertCreateCertificateContext = wincrypt.CertCreateCertificateContext
-CertCreateCertificateContext.argtypes = (DWORD, c_char_p, DWORD)
-CertCreateCertificateContext.restype = PCERT_CONTEXT
-CertCreateCertificateContext.errcheck = _handle_win_error
-
-CertGetCertificateChain = wincrypt.CertGetCertificateChain
-CertGetCertificateChain.argtypes = (
- HCERTCHAINENGINE,
- PCERT_CONTEXT,
- LPFILETIME,
- HCERTSTORE,
- PCERT_CHAIN_PARA,
- DWORD,
- c_void_p,
- PCCERT_CHAIN_CONTEXT,
-)
-CertGetCertificateChain.restype = BOOL
-CertGetCertificateChain.errcheck = _handle_win_error
-
-CertVerifyCertificateChainPolicy = wincrypt.CertVerifyCertificateChainPolicy
-CertVerifyCertificateChainPolicy.argtypes = (
- c_ulong,
- PCERT_CHAIN_CONTEXT,
- PCERT_CHAIN_POLICY_PARA,
- PCERT_CHAIN_POLICY_STATUS,
-)
-CertVerifyCertificateChainPolicy.restype = BOOL
-
-CertCloseStore = wincrypt.CertCloseStore
-CertCloseStore.argtypes = (HCERTSTORE, DWORD)
-CertCloseStore.restype = BOOL
-CertCloseStore.errcheck = _handle_win_error
-
-CertFreeCertificateChain = wincrypt.CertFreeCertificateChain
-CertFreeCertificateChain.argtypes = (PCERT_CHAIN_CONTEXT,)
-
-CertFreeCertificateContext = wincrypt.CertFreeCertificateContext
-CertFreeCertificateContext.argtypes = (PCERT_CONTEXT,)
-
-CertFreeCertificateChainEngine = wincrypt.CertFreeCertificateChainEngine
-CertFreeCertificateChainEngine.argtypes = (HCERTCHAINENGINE,)
-
-FormatMessageW = kernel32.FormatMessageW
-FormatMessageW.argtypes = (
- DWORD,
- LPCVOID,
- DWORD,
- DWORD,
- LPWSTR,
- DWORD,
- c_void_p,
-)
-FormatMessageW.restype = DWORD
-
-
-def _verify_peercerts_impl(
- ssl_context: ssl.SSLContext,
- cert_chain: list[bytes],
- server_hostname: str | None = None,
-) -> None:
- """Verify the cert_chain from the server using Windows APIs."""
-
- # If the peer didn't send any certificates then
- # we can't do verification. Raise an error.
- if not cert_chain:
- raise ssl.SSLCertVerificationError("Peer sent no certificates to verify")
-
- pCertContext = None
- hIntermediateCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, None, 0, None)
- try:
- # Add intermediate certs to an in-memory cert store
- for cert_bytes in cert_chain[1:]:
- CertAddEncodedCertificateToStore(
- hIntermediateCertStore,
- X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
- cert_bytes,
- len(cert_bytes),
- CERT_STORE_ADD_USE_EXISTING,
- None,
- )
-
- # Cert context for leaf cert
- leaf_cert = cert_chain[0]
- pCertContext = CertCreateCertificateContext(
- X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, leaf_cert, len(leaf_cert)
- )
-
- # Chain params to match certs for serverAuth extended usage
- cert_enhkey_usage = CERT_ENHKEY_USAGE()
- cert_enhkey_usage.cUsageIdentifier = 1
- cert_enhkey_usage.rgpszUsageIdentifier = (c_char_p * 1)(OID_PKIX_KP_SERVER_AUTH)
- cert_usage_match = CERT_USAGE_MATCH()
- cert_usage_match.Usage = cert_enhkey_usage
- chain_params = CERT_CHAIN_PARA()
- chain_params.RequestedUsage = cert_usage_match
- chain_params.cbSize = sizeof(chain_params)
- pChainPara = pointer(chain_params)
-
- if ssl_context.verify_flags & ssl.VERIFY_CRL_CHECK_CHAIN:
- chain_flags = CERT_CHAIN_REVOCATION_CHECK_CHAIN
- elif ssl_context.verify_flags & ssl.VERIFY_CRL_CHECK_LEAF:
- chain_flags = CERT_CHAIN_REVOCATION_CHECK_END_CERT
- else:
- chain_flags = 0
-
- try:
- # First attempt to verify using the default Windows system trust roots
- # (default chain engine).
- _get_and_verify_cert_chain(
- ssl_context,
- None,
- hIntermediateCertStore,
- pCertContext,
- pChainPara,
- server_hostname,
- chain_flags=chain_flags,
- )
- except ssl.SSLCertVerificationError as e:
- # If that fails but custom CA certs have been added
- # to the SSLContext using load_verify_locations,
- # try verifying using a custom chain engine
- # that trusts the custom CA certs.
- custom_ca_certs: list[bytes] | None = ssl_context.get_ca_certs(
- binary_form=True
- )
- if custom_ca_certs:
- try:
- _verify_using_custom_ca_certs(
- ssl_context,
- custom_ca_certs,
- hIntermediateCertStore,
- pCertContext,
- pChainPara,
- server_hostname,
- chain_flags=chain_flags,
- )
- # Raise the original error, not the new error.
- except ssl.SSLCertVerificationError:
- raise e from None
- else:
- raise
- finally:
- CertCloseStore(hIntermediateCertStore, 0)
- if pCertContext:
- CertFreeCertificateContext(pCertContext)
-
-
-def _get_and_verify_cert_chain(
- ssl_context: ssl.SSLContext,
- hChainEngine: HCERTCHAINENGINE | None,
- hIntermediateCertStore: HCERTSTORE,
- pPeerCertContext: c_void_p,
- pChainPara: PCERT_CHAIN_PARA, # type: ignore[valid-type]
- server_hostname: str | None,
- chain_flags: int,
-) -> None:
- ppChainContext = None
- try:
- # Get cert chain
- ppChainContext = pointer(PCERT_CHAIN_CONTEXT())
- CertGetCertificateChain(
- hChainEngine, # chain engine
- pPeerCertContext, # leaf cert context
- None, # current system time
- hIntermediateCertStore, # additional in-memory cert store
- pChainPara, # chain-building parameters
- chain_flags,
- None, # reserved
- ppChainContext, # the resulting chain context
- )
- pChainContext = ppChainContext.contents
-
- # Verify cert chain
- ssl_extra_cert_chain_policy_para = SSL_EXTRA_CERT_CHAIN_POLICY_PARA()
- ssl_extra_cert_chain_policy_para.cbSize = sizeof(
- ssl_extra_cert_chain_policy_para
- )
- ssl_extra_cert_chain_policy_para.dwAuthType = AUTHTYPE_SERVER
- ssl_extra_cert_chain_policy_para.fdwChecks = 0
- if ssl_context.check_hostname is False:
- ssl_extra_cert_chain_policy_para.fdwChecks = (
- SECURITY_FLAG_IGNORE_CERT_CN_INVALID
- )
- if server_hostname:
- ssl_extra_cert_chain_policy_para.pwszServerName = c_wchar_p(server_hostname)
-
- chain_policy = CERT_CHAIN_POLICY_PARA()
- chain_policy.pvExtraPolicyPara = cast(
- pointer(ssl_extra_cert_chain_policy_para), c_void_p
- )
- if ssl_context.verify_mode == ssl.CERT_NONE:
- chain_policy.dwFlags |= CERT_CHAIN_POLICY_VERIFY_MODE_NONE_FLAGS
- chain_policy.cbSize = sizeof(chain_policy)
-
- pPolicyPara = pointer(chain_policy)
- policy_status = CERT_CHAIN_POLICY_STATUS()
- policy_status.cbSize = sizeof(policy_status)
- pPolicyStatus = pointer(policy_status)
- CertVerifyCertificateChainPolicy(
- CERT_CHAIN_POLICY_SSL,
- pChainContext,
- pPolicyPara,
- pPolicyStatus,
- )
-
- # Check status
- error_code = policy_status.dwError
- if error_code:
- # Try getting a human readable message for an error code.
- error_message_buf = create_unicode_buffer(1024)
- error_message_chars = FormatMessageW(
- FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
- None,
- error_code,
- 0,
- error_message_buf,
- sizeof(error_message_buf),
- None,
- )
-
- # See if we received a message for the error,
- # otherwise we use a generic error with the
- # error code and hope that it's search-able.
- if error_message_chars <= 0:
- error_message = f"Certificate chain policy error {error_code:#x} [{policy_status.lElementIndex}]"
- else:
- error_message = error_message_buf.value.strip()
-
- err = ssl.SSLCertVerificationError(error_message)
- err.verify_message = error_message
- err.verify_code = error_code
- raise err from None
- finally:
- if ppChainContext:
- CertFreeCertificateChain(ppChainContext.contents)
-
-
-def _verify_using_custom_ca_certs(
- ssl_context: ssl.SSLContext,
- custom_ca_certs: list[bytes],
- hIntermediateCertStore: HCERTSTORE,
- pPeerCertContext: c_void_p,
- pChainPara: PCERT_CHAIN_PARA, # type: ignore[valid-type]
- server_hostname: str | None,
- chain_flags: int,
-) -> None:
- hChainEngine = None
- hRootCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, None, 0, None)
- try:
- # Add custom CA certs to an in-memory cert store
- for cert_bytes in custom_ca_certs:
- CertAddEncodedCertificateToStore(
- hRootCertStore,
- X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
- cert_bytes,
- len(cert_bytes),
- CERT_STORE_ADD_USE_EXISTING,
- None,
- )
-
- # Create a custom cert chain engine which exclusively trusts
- # certs from our hRootCertStore
- cert_chain_engine_config = CERT_CHAIN_ENGINE_CONFIG()
- cert_chain_engine_config.cbSize = sizeof(cert_chain_engine_config)
- cert_chain_engine_config.hExclusiveRoot = hRootCertStore
- pConfig = pointer(cert_chain_engine_config)
- phChainEngine = pointer(HCERTCHAINENGINE())
- CertCreateCertificateChainEngine(
- pConfig,
- phChainEngine,
- )
- hChainEngine = phChainEngine.contents
-
- # Get and verify a cert chain using the custom chain engine
- _get_and_verify_cert_chain(
- ssl_context,
- hChainEngine,
- hIntermediateCertStore,
- pPeerCertContext,
- pChainPara,
- server_hostname,
- chain_flags,
- )
- finally:
- if hChainEngine:
- CertFreeCertificateChainEngine(hChainEngine)
- CertCloseStore(hRootCertStore, 0)
-
-
-@contextlib.contextmanager
-def _configure_context(ctx: ssl.SSLContext) -> typing.Iterator[None]:
- check_hostname = ctx.check_hostname
- verify_mode = ctx.verify_mode
- ctx.check_hostname = False
- _set_ssl_context_verify_mode(ctx, ssl.CERT_NONE)
- try:
- yield
- finally:
- ctx.check_hostname = check_hostname
- _set_ssl_context_verify_mode(ctx, verify_mode)
diff --git a/venv1/Lib/site-packages/pip/_vendor/truststore/py.typed b/venv1/Lib/site-packages/pip/_vendor/truststore/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/_collections.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/_collections.py
index bceb8451..da9857e9 100644
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/_collections.py
+++ b/venv1/Lib/site-packages/pip/_vendor/urllib3/_collections.py
@@ -268,24 +268,6 @@ def getlist(self, key, default=__marker):
else:
return vals[1:]
- def _prepare_for_method_change(self):
- """
- Remove content-specific header fields before changing the request
- method to GET or HEAD according to RFC 9110, Section 15.4.
- """
- content_specific_headers = [
- "Content-Encoding",
- "Content-Language",
- "Content-Location",
- "Content-Type",
- "Content-Length",
- "Digest",
- "Last-Modified",
- ]
- for header in content_specific_headers:
- self.discard(header)
- return self
-
# Backwards compatibility for httplib
getheaders = getlist
getallmatchingheaders = getlist
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/_version.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/_version.py
index d49df2a0..e12dd0e7 100644
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/_version.py
+++ b/venv1/Lib/site-packages/pip/_vendor/urllib3/_version.py
@@ -1,2 +1,2 @@
# This file is protected via CODEOWNERS
-__version__ = "1.26.20"
+__version__ = "1.26.15"
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/connection.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/connection.py
index de35b63d..54b96b19 100644
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/connection.py
+++ b/venv1/Lib/site-packages/pip/_vendor/urllib3/connection.py
@@ -68,7 +68,7 @@ class BrokenPipeError(Exception):
# When it comes time to update this value as a part of regular maintenance
# (ie test_recent_date is failing) update it to ~6 months before the current date.
-RECENT_DATE = datetime.date(2024, 1, 1)
+RECENT_DATE = datetime.date(2022, 1, 1)
_CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]")
@@ -437,7 +437,7 @@ def connect(self):
and self.ssl_version is None
and hasattr(self.sock, "version")
and self.sock.version() in {"TLSv1", "TLSv1.1"}
- ): # Defensive:
+ ):
warnings.warn(
"Negotiating TLSv1/TLSv1.1 by default is deprecated "
"and will be disabled in urllib3 v2.0.0. Connecting to "
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/connectionpool.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/connectionpool.py
index 0872ed77..c23d736b 100644
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/connectionpool.py
+++ b/venv1/Lib/site-packages/pip/_vendor/urllib3/connectionpool.py
@@ -9,7 +9,6 @@
from socket import error as SocketError
from socket import timeout as SocketTimeout
-from ._collections import HTTPHeaderDict
from .connection import (
BaseSSLError,
BrokenPipeError,
@@ -51,13 +50,6 @@
from .util.url import _normalize_host as normalize_host
from .util.url import get_host, parse_url
-try: # Platform-specific: Python 3
- import weakref
-
- weakref_finalize = weakref.finalize
-except AttributeError: # Platform-specific: Python 2
- from .packages.backports.weakref_finalize import weakref_finalize
-
xrange = six.moves.xrange
log = logging.getLogger(__name__)
@@ -228,16 +220,6 @@ def __init__(
self.conn_kw["proxy"] = self.proxy
self.conn_kw["proxy_config"] = self.proxy_config
- # Do not pass 'self' as callback to 'finalize'.
- # Then the 'finalize' would keep an endless living (leak) to self.
- # By just passing a reference to the pool allows the garbage collector
- # to free self if nobody else has a reference to it.
- pool = self.pool
-
- # Close all the HTTPConnections in the pool before the
- # HTTPConnectionPool object is garbage collected.
- weakref_finalize(self, _close_pool_connections, pool)
-
def _new_conn(self):
"""
Return a fresh :class:`HTTPConnection`.
@@ -423,13 +405,12 @@ def _make_request(
pass
except IOError as e:
# Python 2 and macOS/Linux
- # EPIPE and ESHUTDOWN are BrokenPipeError on Python 2, and EPROTOTYPE/ECONNRESET are needed on macOS
+ # EPIPE and ESHUTDOWN are BrokenPipeError on Python 2, and EPROTOTYPE is needed on macOS
# https://erickt.github.io/blog/2014/11/19/adventures-in-debugging-a-potential-osx-kernel-bug/
if e.errno not in {
errno.EPIPE,
errno.ESHUTDOWN,
errno.EPROTOTYPE,
- errno.ECONNRESET,
}:
raise
@@ -508,8 +489,14 @@ def close(self):
# Disable access to the pool
old_pool, self.pool = self.pool, None
- # Close all the HTTPConnections in the pool.
- _close_pool_connections(old_pool)
+ try:
+ while True:
+ conn = old_pool.get(block=False)
+ if conn:
+ conn.close()
+
+ except queue.Empty:
+ pass # Done.
def is_same_host(self, url):
"""
@@ -769,9 +756,7 @@ def _is_ssl_error_message_from_http_proxy(ssl_error):
# so we try to cover our bases here!
message = " ".join(re.split("[^a-z]", str(ssl_error).lower()))
return (
- "wrong version number" in message
- or "unknown protocol" in message
- or "record layer failure" in message
+ "wrong version number" in message or "unknown protocol" in message
)
# Try to detect a common user error with proxies which is to
@@ -847,11 +832,7 @@ def _is_ssl_error_message_from_http_proxy(ssl_error):
redirect_location = redirect and response.get_redirect_location()
if redirect_location:
if response.status == 303:
- # Change the method according to RFC 9110, Section 15.4.4.
method = "GET"
- # And lose the body not to transfer anything sensitive.
- body = None
- headers = HTTPHeaderDict(headers)._prepare_for_method_change()
try:
retries = retries.increment(method, url, response=response, _pool=self)
@@ -1127,14 +1108,3 @@ def _normalize_host(host, scheme):
if host.startswith("[") and host.endswith("]"):
host = host[1:-1]
return host
-
-
-def _close_pool_connections(pool):
- """Drains a queue of connections and closes each one."""
- try:
- while True:
- conn = pool.get(block=False)
- if conn:
- conn.close()
- except queue.Empty:
- pass # Done.
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/contrib/securetransport.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/contrib/securetransport.py
index 722ee4e1..4a06bc69 100644
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/contrib/securetransport.py
+++ b/venv1/Lib/site-packages/pip/_vendor/urllib3/contrib/securetransport.py
@@ -64,8 +64,9 @@
import threading
import weakref
+from pip._vendor import six
+
from .. import util
-from ..packages import six
from ..util.ssl_ import PROTOCOL_TLS_CLIENT
from ._securetransport.bindings import CoreFoundation, Security, SecurityConst
from ._securetransport.low_level import (
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/packages/backports/weakref_finalize.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/packages/backports/weakref_finalize.py
deleted file mode 100644
index a2f2966e..00000000
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/packages/backports/weakref_finalize.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-backports.weakref_finalize
-~~~~~~~~~~~~~~~~~~
-
-Backports the Python 3 ``weakref.finalize`` method.
-"""
-from __future__ import absolute_import
-
-import itertools
-import sys
-from weakref import ref
-
-__all__ = ["weakref_finalize"]
-
-
-class weakref_finalize(object):
- """Class for finalization of weakrefable objects
- finalize(obj, func, *args, **kwargs) returns a callable finalizer
- object which will be called when obj is garbage collected. The
- first time the finalizer is called it evaluates func(*arg, **kwargs)
- and returns the result. After this the finalizer is dead, and
- calling it just returns None.
- When the program exits any remaining finalizers for which the
- atexit attribute is true will be run in reverse order of creation.
- By default atexit is true.
- """
-
- # Finalizer objects don't have any state of their own. They are
- # just used as keys to lookup _Info objects in the registry. This
- # ensures that they cannot be part of a ref-cycle.
-
- __slots__ = ()
- _registry = {}
- _shutdown = False
- _index_iter = itertools.count()
- _dirty = False
- _registered_with_atexit = False
-
- class _Info(object):
- __slots__ = ("weakref", "func", "args", "kwargs", "atexit", "index")
-
- def __init__(self, obj, func, *args, **kwargs):
- if not self._registered_with_atexit:
- # We may register the exit function more than once because
- # of a thread race, but that is harmless
- import atexit
-
- atexit.register(self._exitfunc)
- weakref_finalize._registered_with_atexit = True
- info = self._Info()
- info.weakref = ref(obj, self)
- info.func = func
- info.args = args
- info.kwargs = kwargs or None
- info.atexit = True
- info.index = next(self._index_iter)
- self._registry[self] = info
- weakref_finalize._dirty = True
-
- def __call__(self, _=None):
- """If alive then mark as dead and return func(*args, **kwargs);
- otherwise return None"""
- info = self._registry.pop(self, None)
- if info and not self._shutdown:
- return info.func(*info.args, **(info.kwargs or {}))
-
- def detach(self):
- """If alive then mark as dead and return (obj, func, args, kwargs);
- otherwise return None"""
- info = self._registry.get(self)
- obj = info and info.weakref()
- if obj is not None and self._registry.pop(self, None):
- return (obj, info.func, info.args, info.kwargs or {})
-
- def peek(self):
- """If alive then return (obj, func, args, kwargs);
- otherwise return None"""
- info = self._registry.get(self)
- obj = info and info.weakref()
- if obj is not None:
- return (obj, info.func, info.args, info.kwargs or {})
-
- @property
- def alive(self):
- """Whether finalizer is alive"""
- return self in self._registry
-
- @property
- def atexit(self):
- """Whether finalizer should be called at exit"""
- info = self._registry.get(self)
- return bool(info) and info.atexit
-
- @atexit.setter
- def atexit(self, value):
- info = self._registry.get(self)
- if info:
- info.atexit = bool(value)
-
- def __repr__(self):
- info = self._registry.get(self)
- obj = info and info.weakref()
- if obj is None:
- return "<%s object at %#x; dead>" % (type(self).__name__, id(self))
- else:
- return "<%s object at %#x; for %r at %#x>" % (
- type(self).__name__,
- id(self),
- type(obj).__name__,
- id(obj),
- )
-
- @classmethod
- def _select_for_exit(cls):
- # Return live finalizers marked for exit, oldest first
- L = [(f, i) for (f, i) in cls._registry.items() if i.atexit]
- L.sort(key=lambda item: item[1].index)
- return [f for (f, i) in L]
-
- @classmethod
- def _exitfunc(cls):
- # At shutdown invoke finalizers for which atexit is true.
- # This is called once all other non-daemonic threads have been
- # joined.
- reenable_gc = False
- try:
- if cls._registry:
- import gc
-
- if gc.isenabled():
- reenable_gc = True
- gc.disable()
- pending = None
- while True:
- if pending is None or weakref_finalize._dirty:
- pending = cls._select_for_exit()
- weakref_finalize._dirty = False
- if not pending:
- break
- f = pending.pop()
- try:
- # gc is disabled, so (assuming no daemonic
- # threads) the following is the only line in
- # this function which might trigger creation
- # of a new finalizer
- f()
- except Exception:
- sys.excepthook(*sys.exc_info())
- assert f not in cls._registry
- finally:
- # prevent any more finalizers from executing during shutdown
- weakref_finalize._shutdown = True
- if reenable_gc:
- gc.enable()
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/poolmanager.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/poolmanager.py
index fb51bf7d..ca4ec341 100644
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/poolmanager.py
+++ b/venv1/Lib/site-packages/pip/_vendor/urllib3/poolmanager.py
@@ -4,7 +4,7 @@
import functools
import logging
-from ._collections import HTTPHeaderDict, RecentlyUsedContainer
+from ._collections import RecentlyUsedContainer
from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool, port_by_scheme
from .exceptions import (
LocationValueError,
@@ -171,7 +171,7 @@ class PoolManager(RequestMethods):
def __init__(self, num_pools=10, headers=None, **connection_pool_kw):
RequestMethods.__init__(self, headers)
self.connection_pool_kw = connection_pool_kw
- self.pools = RecentlyUsedContainer(num_pools)
+ self.pools = RecentlyUsedContainer(num_pools, dispose_func=lambda p: p.close())
# Locally set the pool classes and keys so other PoolManagers can
# override them.
@@ -382,12 +382,9 @@ def urlopen(self, method, url, redirect=True, **kw):
# Support relative URLs for redirecting.
redirect_location = urljoin(url, redirect_location)
+ # RFC 7231, Section 6.4.4
if response.status == 303:
- # Change the method according to RFC 9110, Section 15.4.4.
method = "GET"
- # And lose the body not to transfer anything sensitive.
- kw["body"] = None
- kw["headers"] = HTTPHeaderDict(kw["headers"])._prepare_for_method_change()
retries = kw.get("retries")
if not isinstance(retries, Retry):
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/request.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/request.py
index 3b4cf999..398386a5 100644
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/request.py
+++ b/venv1/Lib/site-packages/pip/_vendor/urllib3/request.py
@@ -1,9 +1,6 @@
from __future__ import absolute_import
-import sys
-
from .filepost import encode_multipart_formdata
-from .packages import six
from .packages.six.moves.urllib.parse import urlencode
__all__ = ["RequestMethods"]
@@ -171,21 +168,3 @@ def request_encode_body(
extra_kw.update(urlopen_kw)
return self.urlopen(method, url, **extra_kw)
-
-
-if not six.PY2:
-
- class RequestModule(sys.modules[__name__].__class__):
- def __call__(self, *args, **kwargs):
- """
- If user tries to call this module directly urllib3 v2.x style raise an error to the user
- suggesting they may need urllib3 v2
- """
- raise TypeError(
- "'module' object is not callable\n"
- "urllib3.request() method is not supported in this release, "
- "upgrade to urllib3 v2 to use it\n"
- "see https://urllib3.readthedocs.io/en/stable/v2-migration-guide.html"
- )
-
- sys.modules[__name__].__class__ = RequestModule
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/util/retry.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/util/retry.py
index 9a1e90d0..2490d5e5 100644
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/util/retry.py
+++ b/venv1/Lib/site-packages/pip/_vendor/urllib3/util/retry.py
@@ -235,9 +235,7 @@ class Retry(object):
RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
#: Default headers to be used for ``remove_headers_on_redirect``
- DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(
- ["Cookie", "Authorization", "Proxy-Authorization"]
- )
+ DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Authorization"])
#: Maximum backoff time.
DEFAULT_BACKOFF_MAX = 120
diff --git a/venv1/Lib/site-packages/pip/_vendor/urllib3/util/ssl_.py b/venv1/Lib/site-packages/pip/_vendor/urllib3/util/ssl_.py
index 0a6a0e06..2b45d391 100644
--- a/venv1/Lib/site-packages/pip/_vendor/urllib3/util/ssl_.py
+++ b/venv1/Lib/site-packages/pip/_vendor/urllib3/util/ssl_.py
@@ -1,11 +1,11 @@
from __future__ import absolute_import
-import hashlib
import hmac
import os
import sys
import warnings
from binascii import hexlify, unhexlify
+from hashlib import md5, sha1, sha256
from ..exceptions import (
InsecurePlatformWarning,
@@ -24,10 +24,7 @@
ALPN_PROTOCOLS = ["http/1.1"]
# Maps the length of a digest to a possible hash function producing this digest
-HASHFUNC_MAP = {
- length: getattr(hashlib, algorithm, None)
- for length, algorithm in ((32, "md5"), (40, "sha1"), (64, "sha256"))
-}
+HASHFUNC_MAP = {32: md5, 40: sha1, 64: sha256}
def _const_compare_digest_backport(a, b):
@@ -194,15 +191,9 @@ def assert_fingerprint(cert, fingerprint):
fingerprint = fingerprint.replace(":", "").lower()
digest_length = len(fingerprint)
- if digest_length not in HASHFUNC_MAP:
- raise SSLError("Fingerprint of invalid length: {0}".format(fingerprint))
hashfunc = HASHFUNC_MAP.get(digest_length)
- if hashfunc is None:
- raise SSLError(
- "Hash function implementation unavailable for fingerprint length: {0}".format(
- digest_length
- )
- )
+ if not hashfunc:
+ raise SSLError("Fingerprint of invalid length: {0}".format(fingerprint))
# We need encode() here for py32; works on py2 and p33.
fingerprint_bytes = unhexlify(fingerprint.encode())
diff --git a/venv1/Lib/site-packages/pip/_vendor/vendor.txt b/venv1/Lib/site-packages/pip/_vendor/vendor.txt
index 0cdfda56..61063459 100644
--- a/venv1/Lib/site-packages/pip/_vendor/vendor.txt
+++ b/venv1/Lib/site-packages/pip/_vendor/vendor.txt
@@ -1,19 +1,23 @@
-CacheControl==0.14.3
-distlib==0.4.0
-distro==1.9.0
-msgpack==1.1.2
-packaging==25.0
-platformdirs==4.5.0
-pyproject-hooks==1.2.0
-requests==2.32.5
- certifi==2025.10.5
- idna==3.10
- urllib3==1.26.20
-rich==14.2.0
- pygments==2.19.2
-resolvelib==1.2.1
-setuptools==70.3.0
-tomli==2.3.0
-tomli-w==1.2.0
-truststore==0.10.4
-dependency-groups==1.3.1
+CacheControl==0.12.11 # Make sure to update the license in pyproject.toml for this.
+colorama==0.4.6
+distlib==0.3.6
+distro==1.8.0
+msgpack==1.0.5
+packaging==21.3
+platformdirs==3.2.0
+pyparsing==3.0.9
+pyproject-hooks==1.0.0
+requests==2.28.2
+ certifi==2022.12.7
+ chardet==5.1.0
+ idna==3.4
+ urllib3==1.26.15
+rich==13.3.3
+ pygments==2.14.0
+ typing_extensions==4.5.0
+resolvelib==1.0.1
+setuptools==67.7.2
+six==1.16.0
+tenacity==8.2.2
+tomli==2.0.1
+webencodings==0.5.1
diff --git a/venv1/Scripts/Activate.ps1 b/venv1/Scripts/Activate.ps1
index b8e61edb..d746a8e6 100644
--- a/venv1/Scripts/Activate.ps1
+++ b/venv1/Scripts/Activate.ps1
@@ -219,8 +219,6 @@ deactivate -nondestructive
# that there is an activated venv.
$env:VIRTUAL_ENV = $VenvDir
-$env:VIRTUAL_ENV_PROMPT = $Prompt
-
if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) {
Write-Verbose "Setting prompt to '$Prompt'"
@@ -235,6 +233,7 @@ if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) {
Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) "
_OLD_VIRTUAL_PROMPT
}
+ $env:VIRTUAL_ENV_PROMPT = $Prompt
}
# Clear PYTHONHOME
@@ -248,300 +247,256 @@ Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH
$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH"
# SIG # Begin signature block
-# MII3ZgYJKoZIhvcNAQcCoII3VzCCN1MCAQExDzANBglghkgBZQMEAgEFADB5Bgor
+# MIIvIgYJKoZIhvcNAQcCoIIvEzCCLw8CAQExDzANBglghkgBZQMEAgEFADB5Bgor
# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBALKwKRFIhr2RY
-# IW/WJLd9pc8a9sj/IoThKU92fTfKsKCCG9IwggXMMIIDtKADAgECAhBUmNLR1FsZ
-# lUgTecgRwIeZMA0GCSqGSIb3DQEBDAUAMHcxCzAJBgNVBAYTAlVTMR4wHAYDVQQK
-# ExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xSDBGBgNVBAMTP01pY3Jvc29mdCBJZGVu
-# dGl0eSBWZXJpZmljYXRpb24gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgMjAy
-# MDAeFw0yMDA0MTYxODM2MTZaFw00NTA0MTYxODQ0NDBaMHcxCzAJBgNVBAYTAlVT
-# MR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xSDBGBgNVBAMTP01pY3Jv
-# c29mdCBJZGVudGl0eSBWZXJpZmljYXRpb24gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRo
-# b3JpdHkgMjAyMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALORKgeD
-# Bmf9np3gx8C3pOZCBH8Ppttf+9Va10Wg+3cL8IDzpm1aTXlT2KCGhFdFIMeiVPvH
-# or+Kx24186IVxC9O40qFlkkN/76Z2BT2vCcH7kKbK/ULkgbk/WkTZaiRcvKYhOuD
-# PQ7k13ESSCHLDe32R0m3m/nJxxe2hE//uKya13NnSYXjhr03QNAlhtTetcJtYmrV
-# qXi8LW9J+eVsFBT9FMfTZRY33stuvF4pjf1imxUs1gXmuYkyM6Nix9fWUmcIxC70
-# ViueC4fM7Ke0pqrrBc0ZV6U6CwQnHJFnni1iLS8evtrAIMsEGcoz+4m+mOJyoHI1
-# vnnhnINv5G0Xb5DzPQCGdTiO0OBJmrvb0/gwytVXiGhNctO/bX9x2P29Da6SZEi3
-# W295JrXNm5UhhNHvDzI9e1eM80UHTHzgXhgONXaLbZ7LNnSrBfjgc10yVpRnlyUK
-# xjU9lJfnwUSLgP3B+PR0GeUw9gb7IVc+BhyLaxWGJ0l7gpPKWeh1R+g/OPTHU3mg
-# trTiXFHvvV84wRPmeAyVWi7FQFkozA8kwOy6CXcjmTimthzax7ogttc32H83rwjj
-# O3HbbnMbfZlysOSGM1l0tRYAe1BtxoYT2v3EOYI9JACaYNq6lMAFUSw0rFCZE4e7
-# swWAsk0wAly4JoNdtGNz764jlU9gKL431VulAgMBAAGjVDBSMA4GA1UdDwEB/wQE
-# AwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTIftJqhSobyhmYBAcnz1AQ
-# T2ioojAQBgkrBgEEAYI3FQEEAwIBADANBgkqhkiG9w0BAQwFAAOCAgEAr2rd5hnn
-# LZRDGU7L6VCVZKUDkQKL4jaAOxWiUsIWGbZqWl10QzD0m/9gdAmxIR6QFm3FJI9c
-# Zohj9E/MffISTEAQiwGf2qnIrvKVG8+dBetJPnSgaFvlVixlHIJ+U9pW2UYXeZJF
-# xBA2CFIpF8svpvJ+1Gkkih6PsHMNzBxKq7Kq7aeRYwFkIqgyuH4yKLNncy2RtNwx
-# AQv3Rwqm8ddK7VZgxCwIo3tAsLx0J1KH1r6I3TeKiW5niB31yV2g/rarOoDXGpc8
-# FzYiQR6sTdWD5jw4vU8w6VSp07YEwzJ2YbuwGMUrGLPAgNW3lbBeUU0i/OxYqujY
-# lLSlLu2S3ucYfCFX3VVj979tzR/SpncocMfiWzpbCNJbTsgAlrPhgzavhgplXHT2
-# 6ux6anSg8Evu75SjrFDyh+3XOjCDyft9V77l4/hByuVkrrOj7FjshZrM77nq81YY
-# uVxzmq/FdxeDWds3GhhyVKVB0rYjdaNDmuV3fJZ5t0GNv+zcgKCf0Xd1WF81E+Al
-# GmcLfc4l+gcK5GEh2NQc5QfGNpn0ltDGFf5Ozdeui53bFv0ExpK91IjmqaOqu/dk
-# ODtfzAzQNb50GQOmxapMomE2gj4d8yu8l13bS3g7LfU772Aj6PXsCyM2la+YZr9T
-# 03u4aUoqlmZpxJTG9F9urJh4iIAGXKKy7aIwggb+MIIE5qADAgECAhMzAAbLVm/g
-# dl/pQCFWAAAABstWMA0GCSqGSIb3DQEBDAUAMFoxCzAJBgNVBAYTAlVTMR4wHAYD
-# VQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKzApBgNVBAMTIk1pY3Jvc29mdCBJ
-# RCBWZXJpZmllZCBDUyBFT0MgQ0EgMDIwHhcNMjYwMjAzMDgyODQ3WhcNMjYwMjA2
-# MDgyODQ3WjB8MQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMRIwEAYDVQQH
-# EwlCZWF2ZXJ0b24xIzAhBgNVBAoTGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9u
-# MSMwIQYDVQQDExpQeXRob24gU29mdHdhcmUgRm91bmRhdGlvbjCCAaIwDQYJKoZI
-# hvcNAQEBBQADggGPADCCAYoCggGBAJdXWv7CWGQoqghlPAZXtWrgRvUjGOdfnOno
-# 12rtmBnlpfhf26jIPOqhlTm6TChkJCB5Fv99xXqVdT+tgryGQR4sZV5Ov2/gSkNs
-# 72wV644+9TWUHbAiNrycsxIAuK5mZ61kY1Weody0MAmfryUVi1hsMTOPvn5P+2mG
-# TE9Xz2rWI+iz4O7y0qeob022sImkfWQAkY1+fv7tlxKXNCEfU7lSxptGj/WaQbeV
-# rh1bQisRWypNk+gNTyo5/cuiie0CmAlFj1hgqlMhuuilRgy44TABe6xtnr/m/q37
-# hrLrWkqIt9WfuxoOZ31g4G87kJpG9sQrDEAxKbxoxe2rZN7ryQVm/A+dA49KPh+7
-# PL8YDk70Cpu6YRuodlxopWhEFgrkiYDzO13emveUZO2B1ePk/LZczU+1eaIrkNIA
-# 1jWBNQ067OQR5+TNq0iAa6e+WXsndc4Fph/5Y7qPiNygXOnGYchgTXv0J62n1JZ9
-# t6Uz+FJcgIXcvHB6jDW6i0GhpqLo7QIDAQABo4ICGTCCAhUwDAYDVR0TAQH/BAIw
-# ADAOBgNVHQ8BAf8EBAMCB4AwPAYDVR0lBDUwMwYKKwYBBAGCN2EBAAYIKwYBBQUH
-# AwMGGysGAQQBgjdhgqKNuwqmkohkgZH0oEWCk/3hbzAdBgNVHQ4EFgQU0otww7J0
-# 5gUeVUO9AseaqV7fclUwHwYDVR0jBBgwFoAUZZ9RzoVofy+KRYiq3acxux4NAF4w
-# ZwYDVR0fBGAwXjBcoFqgWIZWaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9w
-# cy9jcmwvTWljcm9zb2Z0JTIwSUQlMjBWZXJpZmllZCUyMENTJTIwRU9DJTIwQ0El
-# MjAwMi5jcmwwgaUGCCsGAQUFBwEBBIGYMIGVMGQGCCsGAQUFBzAChlhodHRwOi8v
-# d3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMElEJTIw
-# VmVyaWZpZWQlMjBDUyUyMEVPQyUyMENBJTIwMDIuY3J0MC0GCCsGAQUFBzABhiFo
-# dHRwOi8vb25lb2NzcC5taWNyb3NvZnQuY29tL29jc3AwZgYDVR0gBF8wXTBRBgwr
-# BgEEAYI3TIN9AQEwQTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQu
-# Y29tL3BraW9wcy9Eb2NzL1JlcG9zaXRvcnkuaHRtMAgGBmeBDAEEATANBgkqhkiG
-# 9w0BAQwFAAOCAgEAnasFEuVrXZqMkkmjnHMITmqw/GsXI83rSgItYpGhNcbx8DZ/
-# ENI072VQg1inVZDLh3hVH29XKMCg+3pBTK4CKpfLUWmIXiGwTXPDNsC1cZD1oMpe
-# jalX6bsD45UxNhqmAnzWuZrrjGWIsDDvSmFsSJb4WJvhzTfbaKe149RkIMY5uJBO
-# sr2UIVTmBug9S8JPxPX5ssXj8lxgSn01C3VPcRqiyzIgzijLj67Qc3IUmvGO/F8Z
-# j+QRdisR6I5/9V8RszASTVEfHSNYhGRYY2OEIjdbKqjDSzmYf4mwN1ALdLM0PEsL
-# /F+ZCYJXJLHJxptckK5PB7nLTd5yF6GV3lES0vINBQ/pUOjK2+G/7xwOeYw7zKbT
-# RdBZTngrEFuzxZFNfid8Y9clqcnDAsqeOepRnhI+0hQdqa8P2aMWf8KYdCXsaE11
-# luELJHfURq8S7Mo0gDpI52xYm/+Osg2SeLrCsl2Ir1iH6IawL/qZfnQu0IWfpsFz
-# /K+CJoHsphngB1/MMNpdXWQqVmsJDxnO+LTpWQuCw3azDJ20vr1wrmzgNLZBmOnf
-# uYz76Emg5+JX0SSaqVIW1bWd5AcNxF7HDxLK7WuiNtMJYLhVJC5mPiE251ly5lfO
-# Jjxdt60snj+F8HM1NjevHnzViscRpCW87d0GpcaJLCrJvVRjzvmL2B+UuDUwggda
-# MIIFQqADAgECAhMzAAAABft6XDITYd9dAAAAAAAFMA0GCSqGSIb3DQEBDAUAMGMx
-# CzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xNDAy
-# BgNVBAMTK01pY3Jvc29mdCBJRCBWZXJpZmllZCBDb2RlIFNpZ25pbmcgUENBIDIw
-# MjEwHhcNMjEwNDEzMTczMTUzWhcNMjYwNDEzMTczMTUzWjBaMQswCQYDVQQGEwJV
-# UzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSswKQYDVQQDEyJNaWNy
-# b3NvZnQgSUQgVmVyaWZpZWQgQ1MgRU9DIENBIDAyMIICIjANBgkqhkiG9w0BAQEF
-# AAOCAg8AMIICCgKCAgEA0hqZfD8ykKTA6CDbWvshmBpDoBf7Lv132RVuSqVwQO3a
-# ALLkuRnnTIoRmMGo0fIMQrtwR6UHB06xdqOkAfqB6exubXTHu44+duHUCdE4ngjE
-# LBQyluMuSOnHaEdveIbt31OhMEX/4nQkph4+Ah0eR4H2sTRrVKmKrlOoQlhia73Q
-# g2dHoitcX1uT1vW3Knpt9Mt76H7ZHbLNspMZLkWBabKMl6BdaWZXYpPGdS+qY80g
-# DaNCvFq0d10UMu7xHesIqXpTDT3Q3AeOxSylSTc/74P3og9j3OuemEFauFzL55t1
-# MvpadEhQmD8uFMxFv/iZOjwvcdY1zhanVLLyplz13/NzSoU3QjhPdqAGhRIwh/YD
-# zo3jCdVJgWQRrW83P3qWFFkxNiME2iO4IuYgj7RwseGwv7I9cxOyaHihKMdT9Neo
-# SjpSNzVnKKGcYMtOdMtKFqoV7Cim2m84GmIYZTBorR/Po9iwlasTYKFpGZqdWKyY
-# nJO2FV8oMmWkIK1iagLLgEt6ZaR0rk/1jUYssyTiRqWr84Qs3XL/V5KUBEtUEQfQ
-# /4RtnI09uFFUIGJZV9mD/xOUksWodGrCQSem6Hy261xMJAHqTqMuDKgwi8xk/mfl
-# r7yhXPL73SOULmu1Aqu4I7Gpe6QwNW2TtQBxM3vtSTmdPW6rK5y0gED51RjsyK0C
-# AwEAAaOCAg4wggIKMA4GA1UdDwEB/wQEAwIBhjAQBgkrBgEEAYI3FQEEAwIBADAd
-# BgNVHQ4EFgQUZZ9RzoVofy+KRYiq3acxux4NAF4wVAYDVR0gBE0wSzBJBgRVHSAA
-# MEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMv
-# RG9jcy9SZXBvc2l0b3J5Lmh0bTAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTAS
-# BgNVHRMBAf8ECDAGAQH/AgEAMB8GA1UdIwQYMBaAFNlBKbAPD2Ns72nX9c0pnqRI
-# ajDmMHAGA1UdHwRpMGcwZaBjoGGGX2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9w
-# a2lvcHMvY3JsL01pY3Jvc29mdCUyMElEJTIwVmVyaWZpZWQlMjBDb2RlJTIwU2ln
-# bmluZyUyMFBDQSUyMDIwMjEuY3JsMIGuBggrBgEFBQcBAQSBoTCBnjBtBggrBgEF
-# BQcwAoZhaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNy
-# b3NvZnQlMjBJRCUyMFZlcmlmaWVkJTIwQ29kZSUyMFNpZ25pbmclMjBQQ0ElMjAy
-# MDIxLmNydDAtBggrBgEFBQcwAYYhaHR0cDovL29uZW9jc3AubWljcm9zb2Z0LmNv
-# bS9vY3NwMA0GCSqGSIb3DQEBDAUAA4ICAQBFSWDUd08X4g5HzvVfrB1SiV8pk6XP
-# HT9jPkCmvU/uvBzmZRAjYk2gKYR3pXoStRJaJ/lhjC5Dq/2R7P1YRZHCDYyK0zvS
-# RMdE6YQtgGjmsdhzD0nCS6hVVcgfmNQscPJ1WHxbvG5EQgYQ0ZED1FN0MOPQzWe1
-# zbH5Va0dSxtnodBVRjnyDYEm7sNEcvJHTG3eXzAyd00E5KDCsEl4z5O0mvXqwaH2
-# PS0200E6P4WqLwgs/NmUu5+Aa8Lw/2En2VkIW7Pkir4Un1jG6+tj/ehuqgFyUPPC
-# h6kbnvk48bisi/zPjAVkj7qErr7fSYICCzJ4s4YUNVVHgdoFn2xbW7ZfBT3QA9zf
-# hq9u4ExXbrVD5rxXSTFEUg2gzQq9JHxsdHyMfcCKLFQOXODSzcYeLpCd+r6GcoDB
-# ToyPdKccjC6mAq6+/hiMDnpvKUIHpyYEzWUeattyKXtMf+QrJeQ+ny5jBL+xqdOO
-# PEz3dg7qn8/oprUrUbGLBv9fWm18fWXdAv1PCtLL/acMLtHoyeSVMKQYqDHb3Qm0
-# uQ+NQ0YE4kUxSQa+W/cCzYAI32uN0nb9M4Mr1pj4bJZidNkM4JyYqezohILxYkgH
-# bboJQISrQWrm5RYdyhKBpptJ9JJn0Z63LjdnzlOUxjlsAbQir2Wmz/OJE703BbHm
-# QZRwzPx1vu7S5zCCB54wggWGoAMCAQICEzMAAAAHh6M0o3uljhwAAAAAAAcwDQYJ
-# KoZIhvcNAQEMBQAwdzELMAkGA1UEBhMCVVMxHjAcBgNVBAoTFU1pY3Jvc29mdCBD
-# b3Jwb3JhdGlvbjFIMEYGA1UEAxM/TWljcm9zb2Z0IElkZW50aXR5IFZlcmlmaWNh
-# dGlvbiBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAyMDIwMB4XDTIxMDQwMTIw
-# MDUyMFoXDTM2MDQwMTIwMTUyMFowYzELMAkGA1UEBhMCVVMxHjAcBgNVBAoTFU1p
-# Y3Jvc29mdCBDb3Jwb3JhdGlvbjE0MDIGA1UEAxMrTWljcm9zb2Z0IElEIFZlcmlm
-# aWVkIENvZGUgU2lnbmluZyBQQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-# ADCCAgoCggIBALLwwK8ZiCji3VR6TElsaQhVCbRS/3pK+MHrJSj3Zxd3KU3rlfL3
-# qrZilYKJNqztA9OQacr1AwoNcHbKBLbsQAhBnIB34zxf52bDpIO3NJlfIaTE/xrw
-# eLoQ71lzCHkD7A4As1Bs076Iu+mA6cQzsYYH/Cbl1icwQ6C65rU4V9NQhNUwgrx9
-# rGQ//h890Q8JdjLLw0nV+ayQ2Fbkd242o9kH82RZsH3HEyqjAB5a8+Ae2nPIPc8s
-# ZU6ZE7iRrRZywRmrKDp5+TcmJX9MRff241UaOBs4NmHOyke8oU1TYrkxh+YeHgfW
-# o5tTgkoSMoayqoDpHOLJs+qG8Tvh8SnifW2Jj3+ii11TS8/FGngEaNAWrbyfNrC6
-# 9oKpRQXY9bGH6jn9NEJv9weFxhTwyvx9OJLXmRGbAUXN1U9nf4lXezky6Uh/cgjk
-# Vd6CGUAf0K+Jw+GE/5VpIVbcNr9rNE50Sbmy/4RTCEGvOq3GhjITbCa4crCzTTHg
-# YYjHs1NbOc6brH+eKpWLtr+bGecy9CrwQyx7S/BfYJ+ozst7+yZtG2wR461uckFu
-# 0t+gCwLdN0A6cFtSRtR8bvxVFyWwTtgMMFRuBa3vmUOTnfKLsLefRaQcVTgRnzeL
-# zdpt32cdYKp+dhr2ogc+qM6K4CBI5/j4VFyC4QFeUP2YAidLtvpXRRo3AgMBAAGj
-# ggI1MIICMTAOBgNVHQ8BAf8EBAMCAYYwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0O
-# BBYEFNlBKbAPD2Ns72nX9c0pnqRIajDmMFQGA1UdIARNMEswSQYEVR0gADBBMD8G
-# CCsGAQUFBwIBFjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL0RvY3Mv
-# UmVwb3NpdG9yeS5odG0wGQYJKwYBBAGCNxQCBAweCgBTAHUAYgBDAEEwDwYDVR0T
-# AQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTIftJqhSobyhmYBAcnz1AQT2ioojCBhAYD
-# VR0fBH0wezB5oHegdYZzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9j
-# cmwvTWljcm9zb2Z0JTIwSWRlbnRpdHklMjBWZXJpZmljYXRpb24lMjBSb290JTIw
-# Q2VydGlmaWNhdGUlMjBBdXRob3JpdHklMjAyMDIwLmNybDCBwwYIKwYBBQUHAQEE
-# gbYwgbMwgYEGCCsGAQUFBzAChnVodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtp
-# b3BzL2NlcnRzL01pY3Jvc29mdCUyMElkZW50aXR5JTIwVmVyaWZpY2F0aW9uJTIw
-# Um9vdCUyMENlcnRpZmljYXRlJTIwQXV0aG9yaXR5JTIwMjAyMC5jcnQwLQYIKwYB
-# BQUHMAGGIWh0dHA6Ly9vbmVvY3NwLm1pY3Jvc29mdC5jb20vb2NzcDANBgkqhkiG
-# 9w0BAQwFAAOCAgEAfyUqnv7Uq+rdZgrbVyNMul5skONbhls5fccPlmIbzi+OwVdP
-# Q4H55v7VOInnmezQEeW4LqK0wja+fBznANbXLB0KrdMCbHQpbLvG6UA/Xv2pfpVI
-# E1CRFfNF4XKO8XYEa3oW8oVH+KZHgIQRIwAbyFKQ9iyj4aOWeAzwk+f9E5StNp5T
-# 8FG7/VEURIVWArbAzPt9ThVN3w1fAZkF7+YU9kbq1bCR2YD+MtunSQ1Rft6XG7b4
-# e0ejRA7mB2IoX5hNh3UEauY0byxNRG+fT2MCEhQl9g2i2fs6VOG19CNep7SquKaB
-# jhWmirYyANb0RJSLWjinMLXNOAga10n8i9jqeprzSMU5ODmrMCJE12xS/NWShg/t
-# uLjAsKP6SzYZ+1Ry358ZTFcx0FS/mx2vSoU8s8HRvy+rnXqyUJ9HBqS0DErVLjQw
-# K8VtsBdekBmdTbQVoCgPCqr+PDPB3xajYnzevs7eidBsM71PINK2BoE2UfMwxCCX
-# 3mccFgx6UsQeRSdVVVNSyALQe6PT12418xon2iDGE81OGCreLzDcMAZnrUAx4XQL
-# Uz6ZTl65yPUiOh3k7Yww94lDf+8oG2oZmDh5O1Qe38E+M3vhKwmzIeoB1dVLlz4i
-# 3IpaDcR+iuGjH2TdaC1ZOmBXiCRKJLj4DT2uhJ04ji+tHD6n58vhavFIrmcxghrq
-# MIIa5gIBATBxMFoxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29y
-# cG9yYXRpb24xKzApBgNVBAMTIk1pY3Jvc29mdCBJRCBWZXJpZmllZCBDUyBFT0Mg
-# Q0EgMDICEzMABstWb+B2X+lAIVYAAAAGy1YwDQYJYIZIAWUDBAIBBQCggbQwGQYJ
-# KoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQB
-# gjcCARUwLwYJKoZIhvcNAQkEMSIEICpXe3RS3b2coD0CJveEHlglqtPUYZ2FqSrO
-# UfP6C6Y4MEgGCisGAQQBgjcCAQwxOjA4oDKAMABQAHkAdABoAG8AbgAgADMALgAx
-# ADMALgAxADIAIAAoADEAYwBiAGUANAA4ADEAKaECgAAwDQYJKoZIhvcNAQEBBQAE
-# ggGATJCrsJUicLrCpF8N3j7QgLaRGpaeQI9ffGxThkfZFhsp7rn8a+TF4eQ5rtRc
-# VJ4UWt3Q0T5O/gwHpuKcwvo7wd2SvR3+j9+Q2p5EmtZQQWOlrytRsFkyODun5GZZ
-# P7Kp49m2pbR5T+cA+1rLHGPvgRdT7aCXg5ZxdHK1qfArZfM1tD0KsfPvA6ydk2MT
-# 1MRA1cAyeF8k9nCD2jnebiMZOCyjyUcu0QULJei1A+DjPkLmdg3GdKgenemn65Dp
-# ym/ZVb2WfJvqr4kQ5A56opS3wn8OXVGQp4lh1FUZzpM/+nUT/xjMEO6TSqdRK52u
-# XOPUliPdliUg7kEq7t6seMFcRUcNG4q9C5rs0SbJ9f2SEkgGypsBxSf6lX7MjuDi
-# 7BX4N8eMGjMeI+Qa4ERMflBM+R5wOkm5JcZ0d6/menoBNPpbzpXGWbBfMHPiWy86
-# +a+XYy1O5QWkJuaW4fo4ojNtA5zV6Q7zdJnUZTV6YwcXeDmGe1c17F9ysb4os9y4
-# EzWKoYIYEzCCGA8GCisGAQQBgjcDAwExghf/MIIX+wYJKoZIhvcNAQcCoIIX7DCC
-# F+gCAQMxDzANBglghkgBZQMEAgEFADCCAWEGCyqGSIb3DQEJEAEEoIIBUASCAUww
-# ggFIAgEBBgorBgEEAYRZCgMBMDEwDQYJYIZIAWUDBAIBBQAEID5IbVievRnShKjl
-# YoBiKfpvanMshYl5yZ+wllrNo5y+AgZpb2FvBcUYEjIwMjYwMjAzMTk0MTA1LjM5
-# WjAEgAIB9KCB4aSB3jCB2zELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0
-# b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3Jh
-# dGlvbjElMCMGA1UECxMcTWljcm9zb2Z0IEFtZXJpY2EgT3BlcmF0aW9uczEnMCUG
-# A1UECxMeblNoaWVsZCBUU1MgRVNOOkE1MDAtMDVFMC1EOTQ3MTUwMwYDVQQDEyxN
-# aWNyb3NvZnQgUHVibGljIFJTQSBUaW1lIFN0YW1waW5nIEF1dGhvcml0eaCCDyEw
-# ggeCMIIFaqADAgECAhMzAAAABeXPD/9mLsmHAAAAAAAFMA0GCSqGSIb3DQEBDAUA
-# MHcxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24x
-# SDBGBgNVBAMTP01pY3Jvc29mdCBJZGVudGl0eSBWZXJpZmljYXRpb24gUm9vdCBD
-# ZXJ0aWZpY2F0ZSBBdXRob3JpdHkgMjAyMDAeFw0yMDExMTkyMDMyMzFaFw0zNTEx
-# MTkyMDQyMzFaMGExCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29y
-# cG9yYXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBQdWJsaWMgUlNBIFRpbWVzdGFt
-# cGluZyBDQSAyMDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnnzn
-# UmP94MWfBX1jtQYioxwe1+eXM9ETBb1lRkd3kcFdcG9/sqtDlwxKoVIcaqDb+omF
-# io5DHC4RBcbyQHjXCwMk/l3TOYtgoBjxnG/eViS4sOx8y4gSq8Zg49REAf5huXhI
-# kQRKe3Qxs8Sgp02KHAznEa/Ssah8nWo5hJM1xznkRsFPu6rfDHeZeG1Wa1wISvlk
-# pOQooTULFm809Z0ZYlQ8Lp7i5F9YciFlyAKwn6yjN/kR4fkquUWfGmMopNq/B8U/
-# pdoZkZZQbxNlqJOiBGgCWpx69uKqKhTPVi3gVErnc/qi+dR8A2MiAz0kN0nh7SqI
-# NGbmw5OIRC0EsZ31WF3Uxp3GgZwetEKxLms73KG/Z+MkeuaVDQQheangOEMGJ4pQ
-# ZH55ngI0Tdy1bi69INBV5Kn2HVJo9XxRYR/JPGAaM6xGl57Ei95HUw9NV/uC3yFj
-# rhc087qLJQawSC3xzY/EXzsT4I7sDbxOmM2rl4uKK6eEpurRduOQ2hTkmG1hSuWY
-# BunFGNv21Kt4N20AKmbeuSnGnsBCd2cjRKG79+TX+sTehawOoxfeOO/jR7wo3liw
-# kGdzPJYHgnJ54UxbckF914AqHOiEV7xTnD1a69w/UTxwjEugpIPMIIE67SFZ2PMo
-# 27xjlLAHWW3l1CEAFjLNHd3EQ79PUr8FUXetXr0CAwEAAaOCAhswggIXMA4GA1Ud
-# DwEB/wQEAwIBhjAQBgkrBgEEAYI3FQEEAwIBADAdBgNVHQ4EFgQUa2koOjUvSGNA
-# z3vYr0npPtk92yEwVAYDVR0gBE0wSzBJBgRVHSAAMEEwPwYIKwYBBQUHAgEWM2h0
-# dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0
-# bTATBgNVHSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMA
-# QTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFMh+0mqFKhvKGZgEByfPUBBP
-# aKiiMIGEBgNVHR8EfTB7MHmgd6B1hnNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20v
-# cGtpb3BzL2NybC9NaWNyb3NvZnQlMjBJZGVudGl0eSUyMFZlcmlmaWNhdGlvbiUy
-# MFJvb3QlMjBDZXJ0aWZpY2F0ZSUyMEF1dGhvcml0eSUyMDIwMjAuY3JsMIGUBggr
-# BgEFBQcBAQSBhzCBhDCBgQYIKwYBBQUHMAKGdWh0dHA6Ly93d3cubWljcm9zb2Z0
-# LmNvbS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwSWRlbnRpdHklMjBWZXJpZmlj
-# YXRpb24lMjBSb290JTIwQ2VydGlmaWNhdGUlMjBBdXRob3JpdHklMjAyMDIwLmNy
-# dDANBgkqhkiG9w0BAQwFAAOCAgEAX4h2x35ttVoVdedMeGj6TuHYRJklFaW4sTQ5
-# r+k77iB79cSLNe+GzRjv4pVjJviceW6AF6ycWoEYR0LYhaa0ozJLU5Yi+LCmcrdo
-# vkl53DNt4EXs87KDogYb9eGEndSpZ5ZM74LNvVzY0/nPISHz0Xva71QjD4h+8z2X
-# MOZzY7YQ0Psw+etyNZ1CesufU211rLslLKsO8F2aBs2cIo1k+aHOhrw9xw6JCWON
-# NboZ497mwYW5EfN0W3zL5s3ad4Xtm7yFM7Ujrhc0aqy3xL7D5FR2J7x9cLWMq7eb
-# 0oYioXhqV2tgFqbKHeDick+P8tHYIFovIP7YG4ZkJWag1H91KlELGWi3SLv10o4K
-# Gag42pswjybTi4toQcC/irAodDW8HNtX+cbz0sMptFJK+KObAnDFHEsukxD+7jFf
-# EV9Hh/+CSxKRsmnuiovCWIOb+H7DRon9TlxydiFhvu88o0w35JkNbJxTk4MhF/Kg
-# aXn0GxdH8elEa2Imq45gaa8D+mTm8LWVydt4ytxYP/bqjN49D9NZ81coE6aQWm88
-# TwIf4R4YZbOpMKN0CyejaPNN41LGXHeCUMYmBx3PkP8ADHD1J2Cr/6tjuOOCztfp
-# +o9Nc+ZoIAkpUcA/X2gSMkgHAPUvIdtoSAHEUKiBhI6JQivRepyvWcl+JYbYbBh7
-# pmgAXVswggeXMIIFf6ADAgECAhMzAAAAVn6PnVgIjulgAAAAAABWMA0GCSqGSIb3
-# DQEBDAUAMGExCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y
-# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBQdWJsaWMgUlNBIFRpbWVzdGFtcGlu
-# ZyBDQSAyMDIwMB4XDTI1MTAyMzIwNDY1MVoXDTI2MTAyMjIwNDY1MVowgdsxCzAJ
-# BgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25k
-# MR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJTAjBgNVBAsTHE1pY3Jv
-# c29mdCBBbWVyaWNhIE9wZXJhdGlvbnMxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVT
-# TjpBNTAwLTA1RTAtRDk0NzE1MDMGA1UEAxMsTWljcm9zb2Z0IFB1YmxpYyBSU0Eg
-# VGltZSBTdGFtcGluZyBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-# ggIKAoICAQC0pZ+b+6XTbv93xGVvwyf+DRBS+8upjZWzLe0jxTa0VKylNmiZk4Pc
-# EdPwuRH5GuEwmBvVWMAoU3Kxor1wtJeJ88ZIgGs8KCz0/jLbiWskSatXpDnPgGao
-# yEg+tmES9mdakJLgc7uNhJ6L+fGYLv/USv6XkuDc+ZLFvx3YhVwBHFLDUHibEHpc
-# jSeR6X3BrV1hvbB8amh+toWbFk7FP142G3gsfREFJW55trpk2mNL/SC1+buqIiLI
-# /qno9HNNNsydWqwedX93+tbTMfH5D5A1nnBSoqZNkkH2FTznf7alfmsN8rfa41j3
-# 9YE4CbNuqCkR1CRuIxq9QzJQNKGbJwi+Ad1CdLbTuxOPwz6Qkve051qE+4+ozCxo
-# IKB1/DBDHQ71Mp7sVK9sARizUCeV0KX8ocZkI5W9Q2qPIvXQkt7T/4YP3/KepcZY
-# Wlc6Nq6e9n9wpE6GM3gzl7rHHRvaaKpw+KLj+KLZmF4pqWUkRPsIqWkVKGzfDKDo
-# X9+iNDFC8+dtYPg3LHqWGNaPCagtzHrDUVIK1q8sKXLfcEtFKVNTiopTFprx3tg3
-# sSqmf1c7RJjS6Y68oVetYfuvGX72JqJyK12dNOSwCdGO96R0pPeWDuVEx+Z9lTy9
-# c2I3RRgnNP0SOqNGbS43+HShfE+E189ip4VvI9cYbHNphTPrPHepNwIDAQABo4IB
-# yzCCAccwHQYDVR0OBBYEFL62M/K7q1n+HkazIu/LPUf4U0haMB8GA1UdIwQYMBaA
-# FGtpKDo1L0hjQM972K9J6T7ZPdshMGwGA1UdHwRlMGMwYaBfoF2GW2h0dHA6Ly93
-# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY3Jvc29mdCUyMFB1YmxpYyUy
-# MFJTQSUyMFRpbWVzdGFtcGluZyUyMENBJTIwMjAyMC5jcmwweQYIKwYBBQUHAQEE
-# bTBrMGkGCCsGAQUFBzAChl1odHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3Bz
-# L2NlcnRzL01pY3Jvc29mdCUyMFB1YmxpYyUyMFJTQSUyMFRpbWVzdGFtcGluZyUy
-# MENBJTIwMjAyMC5jcnQwDAYDVR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEF
-# BQcDCDAOBgNVHQ8BAf8EBAMCB4AwZgYDVR0gBF8wXTBRBgwrBgEEAYI3TIN9AQEw
-# QTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9E
-# b2NzL1JlcG9zaXRvcnkuaHRtMAgGBmeBDAEEAjANBgkqhkiG9w0BAQwFAAOCAgEA
-# DgOoBcSw7bqP8trsWCf9CJ+K3zG5l6Spnnv5h76wf+FFNsQSMZitmCyrBH+VRR8o
-# IWltkXyaxpk9Ak5HhhhQRTxfKMuufxjWMJKajGH2Xu1aJKhz8kUHDfnokCbMYbF4
-# EDYRZLFG5OvUC5l7qdho3z/C0WSIdyzyAxp3FcGzoPFWHK7lieEs9CR+6YqbeUV+
-# 3ATumJ5Xt/WWySaWCwLoB5IYLMY9lSAK9wflO/9B73PtsgiZIPdK7OE4jBo/54pB
-# Nh/rtOJ/IkqRZBJ0Z9MDopy7jWTwsHqg8r4wuTWNvHErnA+otIvrbGMrThIFccQl
-# ISewW3TPFaTE/+WB6PUPGpSeatgR2TG/MpIcgCoVZJm6X/mEj68nG8U+Gw1AESTh
-# xK6UOQlClx1WL+CZ/+YcU5iEMGOxrXmzgv7awGKXddX9PxGJHrpDzFi9MtFbF3Z1
-# Wys6gLCexThYh6ILQmKcK/VYscSHtDLOv1FKviQoktZ2k1guGCOSiNOYSQCMU7vv
-# i3fEHt6du8gXQY6xXX3GcJTOr0QYrK3SAy5qmEqU2Mn5pOmNYxkMaj4Y4qyen3ce
-# Z+2aXRLKncX34zfL7LpYkZRmghkmrbbuMOOMSd22lSuH0F091Uh9UkP8C7zVHOHT
-# lQcCK+itDc6zw8QsciCI531NbNt2CYbNwgu3911VARExggdGMIIHQgIBATB4MGEx
-# CzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xMjAw
-# BgNVBAMTKU1pY3Jvc29mdCBQdWJsaWMgUlNBIFRpbWVzdGFtcGluZyBDQSAyMDIw
-# AhMzAAAAVn6PnVgIjulgAAAAAABWMA0GCWCGSAFlAwQCAQUAoIIEnzARBgsqhkiG
-# 9w0BCRACDzECBQAwGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEEMBwGCSqGSIb3
-# DQEJBTEPFw0yNjAyMDMxOTQxMDVaMC8GCSqGSIb3DQEJBDEiBCD9IoFZknpDXVCH
-# tJ2isniuwcI6Yg0b6DuutG3YE3oT3zCBuQYLKoZIhvcNAQkQAi8xgakwgaYwgaMw
-# gaAEILYMMyVNpOPwlXeJODleel7gJIfrTXjdn5f2jk0GAwyoMHwwZaRjMGExCzAJ
-# BgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xMjAwBgNV
-# BAMTKU1pY3Jvc29mdCBQdWJsaWMgUlNBIFRpbWVzdGFtcGluZyBDQSAyMDIwAhMz
-# AAAAVn6PnVgIjulgAAAAAABWMIIDYQYLKoZIhvcNAQkQAhIxggNQMIIDTKGCA0gw
-# ggNEMIICLAIBATCCAQmhgeGkgd4wgdsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpX
-# YXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQg
-# Q29ycG9yYXRpb24xJTAjBgNVBAsTHE1pY3Jvc29mdCBBbWVyaWNhIE9wZXJhdGlv
-# bnMxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVTTjpBNTAwLTA1RTAtRDk0NzE1MDMG
-# A1UEAxMsTWljcm9zb2Z0IFB1YmxpYyBSU0EgVGltZSBTdGFtcGluZyBBdXRob3Jp
-# dHmiIwoBATAHBgUrDgMCGgMVAP9z9ykVKpBZgF5eCDJEnZlu9gQRoGcwZaRjMGEx
-# CzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xMjAw
-# BgNVBAMTKU1pY3Jvc29mdCBQdWJsaWMgUlNBIFRpbWVzdGFtcGluZyBDQSAyMDIw
-# MA0GCSqGSIb3DQEBCwUAAgUA7SxU1TAiGA8yMDI2MDIwMzExMDQ1M1oYDzIwMjYw
-# MjA0MTEwNDUzWjB3MD0GCisGAQQBhFkKBAExLzAtMAoCBQDtLFTVAgEAMAoCAQAC
-# AgzRAgH/MAcCAQACAhMKMAoCBQDtLaZVAgEAMDYGCisGAQQBhFkKBAIxKDAmMAwG
-# CisGAQQBhFkKAwKgCjAIAgEAAgMHoSChCjAIAgEAAgMBhqAwDQYJKoZIhvcNAQEL
-# BQADggEBALOYBKN41nk7fMBMOxSTfU+Fem0D6ycWllgixiAXAMjW87P/Et+FUyC9
-# 192uE3/ozxzTzjlBmyflkjUfXc0kDLSqVaw5E8A8p9iicwYRrqGXcsaH+PCSBYiS
-# 7QRKZ0UL8+WuU8NsOth7M+ocnEI41KCAIrdtj3I3RmbJFTTu2huLY7Prz7vZ6f/e
-# SZLqwFZwXKI5wnQjHcPQz19lwLKSxzt9fz07HnaCiqwgZhXw6KExhR5xPOLILndh
-# TK6fDPey1LgryqwnBdZp67CaZlxwxkPJ9AlyGoX96ocVo6XYR9ViX9uFW8sUrVTf
-# 6uguhf4WL3ZUZNVb7idiyqkzlLSaIoAwDQYJKoZIhvcNAQEBBQAEggIAQaukese3
-# UNfju7vCwoCftT+ckGKbWvW3UmFnigkIERpHF/VfNrMUbKIy2B3BxIX0CcBeu3tJ
-# QRXjE/1P43wtSJYVUrCbCV3SFAovyN9G4REjTz7JXEa5iiUdA8fldyJ6y2kcC08a
-# 64OqjdQuD+OtMr72I4eflABJ/99BUGvx+8oWBDBsJi+9J6rW4ks7ZR1LHKV6jqwu
-# VzXzo1SRjkktNBvCIjetuyqvQBs4+AAiuCd3oKeeVFpBbVGrlWiCrEztOCeiru9G
-# 89nPiwZl79y1iREZNqr6KwSi9/1xZ37Lzz+Zw+ZRYmEs5mCm5T/ayGuCwODLq/2T
-# L38D9bzi1bOM54jFHdFOawhcLukLHr0qdtMKZqWJwJTFghcWt+DF3B+MdZT3Ny6E
-# 0JXV1Jl/upIQ3QXHTYRQn0dS7qDNVLO8/GawaeKC2Of80FRswGXJbSuGBh0ioPJ3
-# 5smFuQ64Wlqp+nnIv1tL/1ZPrtApm7RJztIIhyo4Aqx0zY29eqUsb+WobnVbrTPz
-# gZpuXsMoOwYRNjEomqISCUV1xgerhBa/bl4LFiJTWhitHXLjwqq9+ialwiw4amG5
-# Ht3sLKPxVK1FR4r/XxFdA/CF38SivpyJ6gWT+DpNAEmlyREWVh9vjuXnQDheXkNb
-# VmGTiwa93gfMzXk5llDFS1z543lnBiUeZ7Q=
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBnL745ElCYk8vk
+# dBtMuQhLeWJ3ZGfzKW4DHCYzAn+QB6CCE8MwggWQMIIDeKADAgECAhAFmxtXno4h
+# MuI5B72nd3VcMA0GCSqGSIb3DQEBDAUAMGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQK
+# EwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNV
+# BAMTGERpZ2lDZXJ0IFRydXN0ZWQgUm9vdCBHNDAeFw0xMzA4MDExMjAwMDBaFw0z
+# ODAxMTUxMjAwMDBaMGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJ
+# bmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0
+# IFRydXN0ZWQgUm9vdCBHNDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+# AL/mkHNo3rvkXUo8MCIwaTPswqclLskhPfKK2FnC4SmnPVirdprNrnsbhA3EMB/z
+# G6Q4FutWxpdtHauyefLKEdLkX9YFPFIPUh/GnhWlfr6fqVcWWVVyr2iTcMKyunWZ
+# anMylNEQRBAu34LzB4TmdDttceItDBvuINXJIB1jKS3O7F5OyJP4IWGbNOsFxl7s
+# Wxq868nPzaw0QF+xembud8hIqGZXV59UWI4MK7dPpzDZVu7Ke13jrclPXuU15zHL
+# 2pNe3I6PgNq2kZhAkHnDeMe2scS1ahg4AxCN2NQ3pC4FfYj1gj4QkXCrVYJBMtfb
+# BHMqbpEBfCFM1LyuGwN1XXhm2ToxRJozQL8I11pJpMLmqaBn3aQnvKFPObURWBf3
+# JFxGj2T3wWmIdph2PVldQnaHiZdpekjw4KISG2aadMreSx7nDmOu5tTvkpI6nj3c
+# AORFJYm2mkQZK37AlLTSYW3rM9nF30sEAMx9HJXDj/chsrIRt7t/8tWMcCxBYKqx
+# YxhElRp2Yn72gLD76GSmM9GJB+G9t+ZDpBi4pncB4Q+UDCEdslQpJYls5Q5SUUd0
+# viastkF13nqsX40/ybzTQRESW+UQUOsxxcpyFiIJ33xMdT9j7CFfxCBRa2+xq4aL
+# T8LWRV+dIPyhHsXAj6KxfgommfXkaS+YHS312amyHeUbAgMBAAGjQjBAMA8GA1Ud
+# EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTs1+OC0nFdZEzf
+# Lmc/57qYrhwPTzANBgkqhkiG9w0BAQwFAAOCAgEAu2HZfalsvhfEkRvDoaIAjeNk
+# aA9Wz3eucPn9mkqZucl4XAwMX+TmFClWCzZJXURj4K2clhhmGyMNPXnpbWvWVPjS
+# PMFDQK4dUPVS/JA7u5iZaWvHwaeoaKQn3J35J64whbn2Z006Po9ZOSJTROvIXQPK
+# 7VB6fWIhCoDIc2bRoAVgX+iltKevqPdtNZx8WorWojiZ83iL9E3SIAveBO6Mm0eB
+# cg3AFDLvMFkuruBx8lbkapdvklBtlo1oepqyNhR6BvIkuQkRUNcIsbiJeoQjYUIp
+# 5aPNoiBB19GcZNnqJqGLFNdMGbJQQXE9P01wI4YMStyB0swylIQNCAmXHE/A7msg
+# dDDS4Dk0EIUhFQEI6FUy3nFJ2SgXUE3mvk3RdazQyvtBuEOlqtPDBURPLDab4vri
+# RbgjU2wGb2dVf0a1TD9uKFp5JtKkqGKX0h7i7UqLvBv9R0oN32dmfrJbQdA75PQ7
+# 9ARj6e/CVABRoIoqyc54zNXqhwQYs86vSYiv85KZtrPmYQ/ShQDnUBrkG5WdGaG5
+# nLGbsQAe79APT0JsyQq87kP6OnGlyE0mpTX9iV28hWIdMtKgK1TtmlfB2/oQzxm3
+# i0objwG2J5VT6LaJbVu8aNQj6ItRolb58KaAoNYes7wPD1N1KarqE3fk3oyBIa0H
+# EEcRrYc9B9F1vM/zZn4wggawMIIEmKADAgECAhAIrUCyYNKcTJ9ezam9k67ZMA0G
+# CSqGSIb3DQEBDAUAMGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJ
+# bmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0
+# IFRydXN0ZWQgUm9vdCBHNDAeFw0yMTA0MjkwMDAwMDBaFw0zNjA0MjgyMzU5NTla
+# MGkxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFBMD8GA1UE
+# AxM4RGlnaUNlcnQgVHJ1c3RlZCBHNCBDb2RlIFNpZ25pbmcgUlNBNDA5NiBTSEEz
+# ODQgMjAyMSBDQTEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDVtC9C
+# 0CiteLdd1TlZG7GIQvUzjOs9gZdwxbvEhSYwn6SOaNhc9es0JAfhS0/TeEP0F9ce
+# 2vnS1WcaUk8OoVf8iJnBkcyBAz5NcCRks43iCH00fUyAVxJrQ5qZ8sU7H/Lvy0da
+# E6ZMswEgJfMQ04uy+wjwiuCdCcBlp/qYgEk1hz1RGeiQIXhFLqGfLOEYwhrMxe6T
+# SXBCMo/7xuoc82VokaJNTIIRSFJo3hC9FFdd6BgTZcV/sk+FLEikVoQ11vkunKoA
+# FdE3/hoGlMJ8yOobMubKwvSnowMOdKWvObarYBLj6Na59zHh3K3kGKDYwSNHR7Oh
+# D26jq22YBoMbt2pnLdK9RBqSEIGPsDsJ18ebMlrC/2pgVItJwZPt4bRc4G/rJvmM
+# 1bL5OBDm6s6R9b7T+2+TYTRcvJNFKIM2KmYoX7BzzosmJQayg9Rc9hUZTO1i4F4z
+# 8ujo7AqnsAMrkbI2eb73rQgedaZlzLvjSFDzd5Ea/ttQokbIYViY9XwCFjyDKK05
+# huzUtw1T0PhH5nUwjewwk3YUpltLXXRhTT8SkXbev1jLchApQfDVxW0mdmgRQRNY
+# mtwmKwH0iU1Z23jPgUo+QEdfyYFQc4UQIyFZYIpkVMHMIRroOBl8ZhzNeDhFMJlP
+# /2NPTLuqDQhTQXxYPUez+rbsjDIJAsxsPAxWEQIDAQABo4IBWTCCAVUwEgYDVR0T
+# AQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUaDfg67Y7+F8Rhvv+YXsIiGX0TkIwHwYD
+# VR0jBBgwFoAU7NfjgtJxXWRM3y5nP+e6mK4cD08wDgYDVR0PAQH/BAQDAgGGMBMG
+# A1UdJQQMMAoGCCsGAQUFBwMDMHcGCCsGAQUFBwEBBGswaTAkBggrBgEFBQcwAYYY
+# aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEEGCCsGAQUFBzAChjVodHRwOi8vY2Fj
+# ZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkUm9vdEc0LmNydDBDBgNV
+# HR8EPDA6MDigNqA0hjJodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRU
+# cnVzdGVkUm9vdEc0LmNybDAcBgNVHSAEFTATMAcGBWeBDAEDMAgGBmeBDAEEATAN
+# BgkqhkiG9w0BAQwFAAOCAgEAOiNEPY0Idu6PvDqZ01bgAhql+Eg08yy25nRm95Ry
+# sQDKr2wwJxMSnpBEn0v9nqN8JtU3vDpdSG2V1T9J9Ce7FoFFUP2cvbaF4HZ+N3HL
+# IvdaqpDP9ZNq4+sg0dVQeYiaiorBtr2hSBh+3NiAGhEZGM1hmYFW9snjdufE5Btf
+# Q/g+lP92OT2e1JnPSt0o618moZVYSNUa/tcnP/2Q0XaG3RywYFzzDaju4ImhvTnh
+# OE7abrs2nfvlIVNaw8rpavGiPttDuDPITzgUkpn13c5UbdldAhQfQDN8A+KVssIh
+# dXNSy0bYxDQcoqVLjc1vdjcshT8azibpGL6QB7BDf5WIIIJw8MzK7/0pNVwfiThV
+# 9zeKiwmhywvpMRr/LhlcOXHhvpynCgbWJme3kuZOX956rEnPLqR0kq3bPKSchh/j
+# wVYbKyP/j7XqiHtwa+aguv06P0WmxOgWkVKLQcBIhEuWTatEQOON8BUozu3xGFYH
+# Ki8QxAwIZDwzj64ojDzLj4gLDb879M4ee47vtevLt/B3E+bnKD+sEq6lLyJsQfmC
+# XBVmzGwOysWGw/YmMwwHS6DTBwJqakAwSEs0qFEgu60bhQjiWQ1tygVQK+pKHJ6l
+# /aCnHwZ05/LWUpD9r4VIIflXO7ScA+2GRfS0YW6/aOImYIbqyK+p/pQd52MbOoZW
+# eE4wggd3MIIFX6ADAgECAhAHHxQbizANJfMU6yMM0NHdMA0GCSqGSIb3DQEBCwUA
+# MGkxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFBMD8GA1UE
+# AxM4RGlnaUNlcnQgVHJ1c3RlZCBHNCBDb2RlIFNpZ25pbmcgUlNBNDA5NiBTSEEz
+# ODQgMjAyMSBDQTEwHhcNMjIwMTE3MDAwMDAwWhcNMjUwMTE1MjM1OTU5WjB8MQsw
+# CQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMRIwEAYDVQQHEwlCZWF2ZXJ0b24x
+# IzAhBgNVBAoTGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMSMwIQYDVQQDExpQ
+# eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+# ADCCAgoCggIBAKgc0BTT+iKbtK6f2mr9pNMUTcAJxKdsuOiSYgDFfwhjQy89koM7
+# uP+QV/gwx8MzEt3c9tLJvDccVWQ8H7mVsk/K+X+IufBLCgUi0GGAZUegEAeRlSXx
+# xhYScr818ma8EvGIZdiSOhqjYc4KnfgfIS4RLtZSrDFG2tN16yS8skFa3IHyvWdb
+# D9PvZ4iYNAS4pjYDRjT/9uzPZ4Pan+53xZIcDgjiTwOh8VGuppxcia6a7xCyKoOA
+# GjvCyQsj5223v1/Ig7Dp9mGI+nh1E3IwmyTIIuVHyK6Lqu352diDY+iCMpk9Zanm
+# SjmB+GMVs+H/gOiofjjtf6oz0ki3rb7sQ8fTnonIL9dyGTJ0ZFYKeb6BLA66d2GA
+# LwxZhLe5WH4Np9HcyXHACkppsE6ynYjTOd7+jN1PRJahN1oERzTzEiV6nCO1M3U1
+# HbPTGyq52IMFSBM2/07WTJSbOeXjvYR7aUxK9/ZkJiacl2iZI7IWe7JKhHohqKuc
+# eQNyOzxTakLcRkzynvIrk33R9YVqtB4L6wtFxhUjvDnQg16xot2KVPdfyPAWd81w
+# tZADmrUtsZ9qG79x1hBdyOl4vUtVPECuyhCxaw+faVjumapPUnwo8ygflJJ74J+B
+# Yxf6UuD7m8yzsfXWkdv52DjL74TxzuFTLHPyARWCSCAbzn3ZIly+qIqDAgMBAAGj
+# ggIGMIICAjAfBgNVHSMEGDAWgBRoN+Drtjv4XxGG+/5hewiIZfROQjAdBgNVHQ4E
+# FgQUt/1Teh2XDuUj2WW3siYWJgkZHA8wDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM
+# MAoGCCsGAQUFBwMDMIG1BgNVHR8Ega0wgaowU6BRoE+GTWh0dHA6Ly9jcmwzLmRp
+# Z2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRHNENvZGVTaWduaW5nUlNBNDA5NlNI
+# QTM4NDIwMjFDQTEuY3JsMFOgUaBPhk1odHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
+# RGlnaUNlcnRUcnVzdGVkRzRDb2RlU2lnbmluZ1JTQTQwOTZTSEEzODQyMDIxQ0Ex
+# LmNybDA+BgNVHSAENzA1MDMGBmeBDAEEATApMCcGCCsGAQUFBwIBFhtodHRwOi8v
+# d3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgZQGCCsGAQUFBwEBBIGHMIGEMCQGCCsGAQUF
+# BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wXAYIKwYBBQUHMAKGUGh0dHA6
+# Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRHNENvZGVTaWdu
+# aW5nUlNBNDA5NlNIQTM4NDIwMjFDQTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZI
+# hvcNAQELBQADggIBABxv4AeV/5ltkELHSC63fXAFYS5tadcWTiNc2rskrNLrfH1N
+# s0vgSZFoQxYBFKI159E8oQQ1SKbTEubZ/B9kmHPhprHya08+VVzxC88pOEvz68nA
+# 82oEM09584aILqYmj8Pj7h/kmZNzuEL7WiwFa/U1hX+XiWfLIJQsAHBla0i7QRF2
+# de8/VSF0XXFa2kBQ6aiTsiLyKPNbaNtbcucaUdn6vVUS5izWOXM95BSkFSKdE45O
+# q3FForNJXjBvSCpwcP36WklaHL+aHu1upIhCTUkzTHMh8b86WmjRUqbrnvdyR2yd
+# I5l1OqcMBjkpPpIV6wcc+KY/RH2xvVuuoHjlUjwq2bHiNoX+W1scCpnA8YTs2d50
+# jDHUgwUo+ciwpffH0Riq132NFmrH3r67VaN3TuBxjI8SIZM58WEDkbeoriDk3hxU
+# 8ZWV7b8AW6oyVBGfM06UgkfMb58h+tJPrFx8VI/WLq1dTqMfZOm5cuclMnUHs2uq
+# rRNtnV8UfidPBL4ZHkTcClQbCoz0UbLhkiDvIS00Dn+BBcxw/TKqVL4Oaz3bkMSs
+# M46LciTeucHY9ExRVt3zy7i149sd+F4QozPqn7FrSVHXmem3r7bjyHTxOgqxRCVa
+# 18Vtx7P/8bYSBeS+WHCKcliFCecspusCDSlnRUjZwyPdP0VHxaZg2unjHY3rMYIa
+# tTCCGrECAQEwfTBpMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIElu
+# Yy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0ZWQgRzQgQ29kZSBTaWduaW5nIFJT
+# QTQwOTYgU0hBMzg0IDIwMjEgQ0ExAhAHHxQbizANJfMU6yMM0NHdMA0GCWCGSAFl
+# AwQCAQUAoIHIMBkGCSqGSIb3DQEJAzEMBgorBgEEAYI3AgEEMBwGCisGAQQBgjcC
+# AQsxDjAMBgorBgEEAYI3AgEVMC8GCSqGSIb3DQEJBDEiBCBnAZ6P7YvTwq0fbF62
+# o7E75R0LxsW5OtyYiFESQckLhjBcBgorBgEEAYI3AgEMMU4wTKBGgEQAQgB1AGkA
+# bAB0ADoAIABSAGUAbABlAGEAcwBlAF8AdgAzAC4AMQAxAC4ANABfADIAMAAyADMA
+# MAA2ADAANwAuADAAMaECgAAwDQYJKoZIhvcNAQEBBQAEggIAVdxtEr9NH8SoVTzT
+# o/jdr3t1yqExSecge3YGCu9USfMqLtmCKzG5r2rf3xZkJ6CpvmHwji3FUY6Hl991
+# Ttd0eEEpjeEse9gotnojgHTQACJntGuPcK+65jIQYNvp3JIuczjTW0JjWkJf4lqI
+# hVS6rEc00D/0NsUF9BbNkjNZ0AUQeOWe2WZJnqRRFN4U3pToN51NDjpEtRjlNTkc
+# SzoNO7ZyEsSXkNenlgbgS1yXEQ8v4bbnbPyyL+2yWMG1QsLv6M3OV0kXx9aow1r5
+# gZ1mCjBkbtWKH58WVBoepUaPYTjFBWCT2pDrorbg6cguwBdyz7s8X+WlCD4ycFfW
+# o95x7u1W9RwPPPppszr8Pd4jZSbEXEQ/G9Ke5NvTvNmK93b7/kySfNYfwW2meP6E
+# JIc0R9DMSZlK+ChtU5mmvo4e6YQTLXIXQhPIz7jVNlUjXMJX7WALjE72EDdC5MpQ
+# ygW7wue6EhjlUVXT4pEIySCGaXxUzRi1oh+Q+Jbe3rDvhSPZUWzCqEtOkJ35dLYh
+# D9Rahi2BM1qaepfu1wVtSXbVbc0SDPjloojEmTyDnk61u5epo0E0oHqNAU8t1ZTN
+# +Guptl/agMp52uRsaC5Bi276icqRtclfx9E4SfJEiw7xRlImCclMpw2dRsyzIrpb
+# MKpWDAno4rClgYS3M9lqQ71RlXehghc+MIIXOgYKKwYBBAGCNwMDATGCFyowghcm
+# BgkqhkiG9w0BBwKgghcXMIIXEwIBAzEPMA0GCWCGSAFlAwQCAQUAMHgGCyqGSIb3
+# DQEJEAEEoGkEZzBlAgEBBglghkgBhv1sBwEwMTANBglghkgBZQMEAgEFAAQgsPGH
+# UIiYgGXi/94WNZrP+V1kV/B5SVJn3ck+XzTJ0aACEQCJ79BpOkCDCW06IgZOU3EQ
+# GA8yMDIzMDYwNzA1NTc0NFqgghMHMIIGwDCCBKigAwIBAgIQDE1pckuU+jwqSj0p
+# B4A9WjANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGln
+# aUNlcnQsIEluYy4xOzA5BgNVBAMTMkRpZ2lDZXJ0IFRydXN0ZWQgRzQgUlNBNDA5
+# NiBTSEEyNTYgVGltZVN0YW1waW5nIENBMB4XDTIyMDkyMTAwMDAwMFoXDTMzMTEy
+# MTIzNTk1OVowRjELMAkGA1UEBhMCVVMxETAPBgNVBAoTCERpZ2lDZXJ0MSQwIgYD
+# VQQDExtEaWdpQ2VydCBUaW1lc3RhbXAgMjAyMiAtIDIwggIiMA0GCSqGSIb3DQEB
+# AQUAA4ICDwAwggIKAoICAQDP7KUmOsap8mu7jcENmtuh6BSFdDMaJqzQHFUeHjZt
+# vJJVDGH0nQl3PRWWCC9rZKT9BoMW15GSOBwxApb7crGXOlWvM+xhiummKNuQY1y9
+# iVPgOi2Mh0KuJqTku3h4uXoW4VbGwLpkU7sqFudQSLuIaQyIxvG+4C99O7HKU41A
+# gx7ny3JJKB5MgB6FVueF7fJhvKo6B332q27lZt3iXPUv7Y3UTZWEaOOAy2p50dIQ
+# kUYp6z4m8rSMzUy5Zsi7qlA4DeWMlF0ZWr/1e0BubxaompyVR4aFeT4MXmaMGgok
+# vpyq0py2909ueMQoP6McD1AGN7oI2TWmtR7aeFgdOej4TJEQln5N4d3CraV++C0b
+# H+wrRhijGfY59/XBT3EuiQMRoku7mL/6T+R7Nu8GRORV/zbq5Xwx5/PCUsTmFnta
+# fqUlc9vAapkhLWPlWfVNL5AfJ7fSqxTlOGaHUQhr+1NDOdBk+lbP4PQK5hRtZHi7
+# mP2Uw3Mh8y/CLiDXgazT8QfU4b3ZXUtuMZQpi+ZBpGWUwFjl5S4pkKa3YWT62SBs
+# GFFguqaBDwklU/G/O+mrBw5qBzliGcnWhX8T2Y15z2LF7OF7ucxnEweawXjtxojI
+# sG4yeccLWYONxu71LHx7jstkifGxxLjnU15fVdJ9GSlZA076XepFcxyEftfO4tQ6
+# dwIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwFgYD
+# VR0lAQH/BAwwCgYIKwYBBQUHAwgwIAYDVR0gBBkwFzAIBgZngQwBBAIwCwYJYIZI
+# AYb9bAcBMB8GA1UdIwQYMBaAFLoW2W1NhS9zKXaaL3WMaiCPnshvMB0GA1UdDgQW
+# BBRiit7QYfyPMRTtlwvNPSqUFN9SnDBaBgNVHR8EUzBRME+gTaBLhklodHRwOi8v
+# Y3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0MDk2U0hBMjU2
+# VGltZVN0YW1waW5nQ0EuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDAkBggrBgEFBQcw
+# AYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFgGCCsGAQUFBzAChkxodHRwOi8v
+# Y2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0MDk2U0hB
+# MjU2VGltZVN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQBVqioa80bz
+# eFc3MPx140/WhSPx/PmVOZsl5vdyipjDd9Rk/BX7NsJJUSx4iGNVCUY5APxp1Mqb
+# KfujP8DJAJsTHbCYidx48s18hc1Tna9i4mFmoxQqRYdKmEIrUPwbtZ4IMAn65C3X
+# CYl5+QnmiM59G7hqopvBU2AJ6KO4ndetHxy47JhB8PYOgPvk/9+dEKfrALpfSo8a
+# OlK06r8JSRU1NlmaD1TSsht/fl4JrXZUinRtytIFZyt26/+YsiaVOBmIRBTlClmi
+# a+ciPkQh0j8cwJvtfEiy2JIMkU88ZpSvXQJT657inuTTH4YBZJwAwuladHUNPeF5
+# iL8cAZfJGSOA1zZaX5YWsWMMxkZAO85dNdRZPkOaGK7DycvD+5sTX2q1x+DzBcNZ
+# 3ydiK95ByVO5/zQQZ/YmMph7/lxClIGUgp2sCovGSxVK05iQRWAzgOAj3vgDpPZF
+# R+XOuANCR+hBNnF3rf2i6Jd0Ti7aHh2MWsgemtXC8MYiqE+bvdgcmlHEL5r2X6cn
+# l7qWLoVXwGDneFZ/au/ClZpLEQLIgpzJGgV8unG1TnqZbPTontRamMifv427GFxD
+# 9dAq6OJi7ngE273R+1sKqHB+8JeEeOMIA11HLGOoJTiXAdI/Otrl5fbmm9x+LMz/
+# F0xNAKLY1gEOuIvu5uByVYksJxlh9ncBjDCCBq4wggSWoAMCAQICEAc2N7ckVHzY
+# R6z9KGYqXlswDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCVVMxFTATBgNVBAoT
+# DERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEhMB8GA1UE
+# AxMYRGlnaUNlcnQgVHJ1c3RlZCBSb290IEc0MB4XDTIyMDMyMzAwMDAwMFoXDTM3
+# MDMyMjIzNTk1OVowYzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJ
+# bmMuMTswOQYDVQQDEzJEaWdpQ2VydCBUcnVzdGVkIEc0IFJTQTQwOTYgU0hBMjU2
+# IFRpbWVTdGFtcGluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+# AMaGNQZJs8E9cklRVcclA8TykTepl1Gh1tKD0Z5Mom2gsMyD+Vr2EaFEFUJfpIjz
+# aPp985yJC3+dH54PMx9QEwsmc5Zt+FeoAn39Q7SE2hHxc7Gz7iuAhIoiGN/r2j3E
+# F3+rGSs+QtxnjupRPfDWVtTnKC3r07G1decfBmWNlCnT2exp39mQh0YAe9tEQYnc
+# fGpXevA3eZ9drMvohGS0UvJ2R/dhgxndX7RUCyFobjchu0CsX7LeSn3O9TkSZ+8O
+# pWNs5KbFHc02DVzV5huowWR0QKfAcsW6Th+xtVhNef7Xj3OTrCw54qVI1vCwMROp
+# VymWJy71h6aPTnYVVSZwmCZ/oBpHIEPjQ2OAe3VuJyWQmDo4EbP29p7mO1vsgd4i
+# FNmCKseSv6De4z6ic/rnH1pslPJSlRErWHRAKKtzQ87fSqEcazjFKfPKqpZzQmif
+# tkaznTqj1QPgv/CiPMpC3BhIfxQ0z9JMq++bPf4OuGQq+nUoJEHtQr8FnGZJUlD0
+# UfM2SU2LINIsVzV5K6jzRWC8I41Y99xh3pP+OcD5sjClTNfpmEpYPtMDiP6zj9Ne
+# S3YSUZPJjAw7W4oiqMEmCPkUEBIDfV8ju2TjY+Cm4T72wnSyPx4JduyrXUZ14mCj
+# WAkBKAAOhFTuzuldyF4wEr1GnrXTdrnSDmuZDNIztM2xAgMBAAGjggFdMIIBWTAS
+# BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBS6FtltTYUvcyl2mi91jGogj57I
+# bzAfBgNVHSMEGDAWgBTs1+OC0nFdZEzfLmc/57qYrhwPTzAOBgNVHQ8BAf8EBAMC
+# AYYwEwYDVR0lBAwwCgYIKwYBBQUHAwgwdwYIKwYBBQUHAQEEazBpMCQGCCsGAQUF
+# BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQQYIKwYBBQUHMAKGNWh0dHA6
+# Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRSb290RzQuY3J0
+# MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdp
+# Q2VydFRydXN0ZWRSb290RzQuY3JsMCAGA1UdIAQZMBcwCAYGZ4EMAQQCMAsGCWCG
+# SAGG/WwHATANBgkqhkiG9w0BAQsFAAOCAgEAfVmOwJO2b5ipRCIBfmbW2CFC4bAY
+# LhBNE88wU86/GPvHUF3iSyn7cIoNqilp/GnBzx0H6T5gyNgL5Vxb122H+oQgJTQx
+# Z822EpZvxFBMYh0MCIKoFr2pVs8Vc40BIiXOlWk/R3f7cnQU1/+rT4osequFzUNf
+# 7WC2qk+RZp4snuCKrOX9jLxkJodskr2dfNBwCnzvqLx1T7pa96kQsl3p/yhUifDV
+# inF2ZdrM8HKjI/rAJ4JErpknG6skHibBt94q6/aesXmZgaNWhqsKRcnfxI2g55j7
+# +6adcq/Ex8HBanHZxhOACcS2n82HhyS7T6NJuXdmkfFynOlLAlKnN36TU6w7HQhJ
+# D5TNOXrd/yVjmScsPT9rp/Fmw0HNT7ZAmyEhQNC3EyTN3B14OuSereU0cZLXJmvk
+# OHOrpgFPvT87eK1MrfvElXvtCl8zOYdBeHo46Zzh3SP9HSjTx/no8Zhf+yvYfvJG
+# nXUsHicsJttvFXseGYs2uJPU5vIXmVnKcPA3v5gA3yAWTyf7YGcWoWa63VXAOimG
+# sJigK+2VQbc61RWYMbRiCQ8KvYHZE/6/pNHzV9m8BPqC3jLfBInwAM1dwvnQI38A
+# C+R2AibZ8GV2QqYphwlHK+Z/GqSFD/yYlvZVVCsfgPrA8g4r5db7qS9EFUrnEw4d
+# 2zc4GqEr9u3WfPwwggWNMIIEdaADAgECAhAOmxiO+dAt5+/bUOIIQBhaMA0GCSqG
+# SIb3DQEBDAUAMGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMx
+# GTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEFz
+# c3VyZWQgSUQgUm9vdCBDQTAeFw0yMjA4MDEwMDAwMDBaFw0zMTExMDkyMzU5NTla
+# MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsT
+# EHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFRydXN0ZWQgUm9v
+# dCBHNDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL/mkHNo3rvkXUo8
+# MCIwaTPswqclLskhPfKK2FnC4SmnPVirdprNrnsbhA3EMB/zG6Q4FutWxpdtHauy
+# efLKEdLkX9YFPFIPUh/GnhWlfr6fqVcWWVVyr2iTcMKyunWZanMylNEQRBAu34Lz
+# B4TmdDttceItDBvuINXJIB1jKS3O7F5OyJP4IWGbNOsFxl7sWxq868nPzaw0QF+x
+# embud8hIqGZXV59UWI4MK7dPpzDZVu7Ke13jrclPXuU15zHL2pNe3I6PgNq2kZhA
+# kHnDeMe2scS1ahg4AxCN2NQ3pC4FfYj1gj4QkXCrVYJBMtfbBHMqbpEBfCFM1Lyu
+# GwN1XXhm2ToxRJozQL8I11pJpMLmqaBn3aQnvKFPObURWBf3JFxGj2T3wWmIdph2
+# PVldQnaHiZdpekjw4KISG2aadMreSx7nDmOu5tTvkpI6nj3cAORFJYm2mkQZK37A
+# lLTSYW3rM9nF30sEAMx9HJXDj/chsrIRt7t/8tWMcCxBYKqxYxhElRp2Yn72gLD7
+# 6GSmM9GJB+G9t+ZDpBi4pncB4Q+UDCEdslQpJYls5Q5SUUd0viastkF13nqsX40/
+# ybzTQRESW+UQUOsxxcpyFiIJ33xMdT9j7CFfxCBRa2+xq4aLT8LWRV+dIPyhHsXA
+# j6KxfgommfXkaS+YHS312amyHeUbAgMBAAGjggE6MIIBNjAPBgNVHRMBAf8EBTAD
+# AQH/MB0GA1UdDgQWBBTs1+OC0nFdZEzfLmc/57qYrhwPTzAfBgNVHSMEGDAWgBRF
+# 66Kv9JLLgjEtUYunpyGd823IDzAOBgNVHQ8BAf8EBAMCAYYweQYIKwYBBQUHAQEE
+# bTBrMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQwYIKwYB
+# BQUHMAKGN2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEFzc3Vy
+# ZWRJRFJvb3RDQS5jcnQwRQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybDMuZGln
+# aWNlcnQuY29tL0RpZ2lDZXJ0QXNzdXJlZElEUm9vdENBLmNybDARBgNVHSAECjAI
+# MAYGBFUdIAAwDQYJKoZIhvcNAQEMBQADggEBAHCgv0NcVec4X6CjdBs9thbX979X
+# B72arKGHLOyFXqkauyL4hxppVCLtpIh3bb0aFPQTSnovLbc47/T/gLn4offyct4k
+# vFIDyE7QKt76LVbP+fT3rDB6mouyXtTP0UNEm0Mh65ZyoUi0mcudT6cGAxN3J0TU
+# 53/oWajwvy8LpunyNDzs9wPHh6jSTEAZNUZqaVSwuKFWjuyk1T3osdz9HNj0d1pc
+# VIxv76FQPfx2CWiEn2/K2yCNNWAcAgPLILCsWKAOQGPFmCLBsln1VWvPJ6tsds5v
+# Iy30fnFqI2si/xK4VC0nftg62fC2h5b9W9FcrBjDTZ9ztwGpn1eqXijiuZQxggN2
+# MIIDcgIBATB3MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5j
+# LjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNIQTI1NiBU
+# aW1lU3RhbXBpbmcgQ0ECEAxNaXJLlPo8Kko9KQeAPVowDQYJYIZIAWUDBAIBBQCg
+# gdEwGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEEMBwGCSqGSIb3DQEJBTEPFw0y
+# MzA2MDcwNTU3NDRaMCsGCyqGSIb3DQEJEAIMMRwwGjAYMBYEFPOHIk2GM4KSNamU
+# vL2Plun+HHxzMC8GCSqGSIb3DQEJBDEiBCAZCWWaBjTHAZnsndSxyxCaZSOrTyqo
+# O35hv3VOlS9KHDA3BgsqhkiG9w0BCRACLzEoMCYwJDAiBCDH9OG+MiiJIKviJjq+
+# GsT8T+Z4HC1k0EyAdVegI7W2+jANBgkqhkiG9w0BAQEFAASCAgBt92vHxbHXh4Z2
+# yl+aTo7PltgPhZhoQCWg+gDSyySEqkDN+kTuoW3ROuMjR1JR0htJOwVqnmI/enhW
+# r8VJiDKfGOGupHEfzAlMaIIC+K+C3sSoeaRR1aiOWrUA/oPpJIgwXyfo65Hf07qf
+# wdn//4y5zv6oMdHNtpSfFgibze5BjNRAgOUxl9rvKArEN7B+WTCnvLWw/EJe48MQ
+# B0zUbVFIORQUHlLnCL07JGRSN5bHaMtnn5eEwZFC9522kJaHyLrmfeP4jZLMhjhn
+# fGxv69HVzggM8CpjpQA8l8hh6Il48TDMZpdqkxwjoRmJVwt3hwTrfuE11NFrXEAD
+# 8dAAta6N/M722c3BE6UxM2R4QXyV05BL6e4jVJm1aR1ebUVS4nZVZ/jbCexR/+vx
+# mfSh1SezU3KlgRMDrLF+El883BFoe/99p4/QjjnELhn41lPPAYGefhMI9ioYZULQ
+# xMyG6qIPA8s2tnYIL/AKvh7SUgFVtOsTKbTFXMMr20sipBQQFUOb8ZD+8u4Iyc4M
+# UC4d2S6z9zwlPbSr1lk9m3R8rl+j2/VkB1S21nqda3xWFk/+n/2oEJe4gUkCiQxs
+# qFaykkcAhWYdZVRRNM89ZF23DeYAEkUEaD2M1ld0CZNtvtPNmv/NZV/Xbb3H0RPR
+# yDBB2JQI1BbEjl7HWy616MUsAqWA+Q==
# SIG # End signature block
diff --git a/venv1/Scripts/activate b/venv1/Scripts/activate
index 2d13673f..e7de9788 100644
--- a/venv1/Scripts/activate
+++ b/venv1/Scripts/activate
@@ -1,5 +1,5 @@
# This file must be used with "source bin/activate" *from bash*
-# You cannot run it directly
+# you cannot run it directly
deactivate () {
# reset old environment variables
@@ -14,10 +14,12 @@ deactivate () {
unset _OLD_VIRTUAL_PYTHONHOME
fi
- # Call hash to forget past locations. Without forgetting
- # past locations the $PATH changes we made may not be respected.
- # See "man bash" for more details. hash is usually a builtin of your shell
- hash -r 2> /dev/null
+ # This should detect bash and zsh, which have a hash command that must
+ # be called to get it to forget past commands. Without forgetting
+ # past commands the $PATH changes we made may not be respected
+ if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
+ hash -r 2> /dev/null
+ fi
if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then
PS1="${_OLD_VIRTUAL_PS1:-}"
@@ -36,27 +38,13 @@ deactivate () {
# unset irrelevant variables
deactivate nondestructive
-# on Windows, a path can contain colons and backslashes and has to be converted:
-case "$(uname)" in
- CYGWIN*|MSYS*|MINGW*)
- # transform D:\path\to\venv to /d/path/to/venv on MSYS and MINGW
- # and to /cygdrive/d/path/to/venv on Cygwin
- VIRTUAL_ENV=$(cygpath 'C:\Users\Pooja\Downloads\Achievement-Management-System\venv1')
- export VIRTUAL_ENV
- ;;
- *)
- # use the path as-is
- export VIRTUAL_ENV='C:\Users\Pooja\Downloads\Achievement-Management-System\venv1'
- ;;
-esac
+VIRTUAL_ENV="C:\Users\D S MOHANTO JULLIET\Achievement-Management-System\venv1"
+export VIRTUAL_ENV
_OLD_VIRTUAL_PATH="$PATH"
-PATH="$VIRTUAL_ENV/"Scripts":$PATH"
+PATH="$VIRTUAL_ENV/Scripts:$PATH"
export PATH
-VIRTUAL_ENV_PROMPT=venv1
-export VIRTUAL_ENV_PROMPT
-
# unset PYTHONHOME if set
# this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
# could use `if (set -u; : $PYTHONHOME) ;` in bash
@@ -67,10 +55,15 @@ fi
if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
_OLD_VIRTUAL_PS1="${PS1:-}"
- PS1="("venv1") ${PS1:-}"
+ PS1="(venv1) ${PS1:-}"
export PS1
+ VIRTUAL_ENV_PROMPT="(venv1) "
+ export VIRTUAL_ENV_PROMPT
fi
-# Call hash to forget past commands. Without forgetting
+# This should detect bash and zsh, which have a hash command that must
+# be called to get it to forget past commands. Without forgetting
# past commands the $PATH changes we made may not be respected
-hash -r 2> /dev/null
+if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
+ hash -r 2> /dev/null
+fi
diff --git a/venv1/Scripts/activate.bat b/venv1/Scripts/activate.bat
index 0f3f36cd..b2f66537 100644
--- a/venv1/Scripts/activate.bat
+++ b/venv1/Scripts/activate.bat
@@ -8,15 +8,15 @@ if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" 65001 > nul
)
-set "VIRTUAL_ENV=C:\Users\Pooja\Downloads\Achievement-Management-System\venv1"
+set VIRTUAL_ENV=C:\Users\D S MOHANTO JULLIET\Achievement-Management-System\venv1
if not defined PROMPT set PROMPT=$P$G
if defined _OLD_VIRTUAL_PROMPT set PROMPT=%_OLD_VIRTUAL_PROMPT%
if defined _OLD_VIRTUAL_PYTHONHOME set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%
-set "_OLD_VIRTUAL_PROMPT=%PROMPT%"
-set "PROMPT=(venv1) %PROMPT%"
+set _OLD_VIRTUAL_PROMPT=%PROMPT%
+set PROMPT=(venv1) %PROMPT%
if defined PYTHONHOME set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
set PYTHONHOME=
@@ -24,8 +24,8 @@ set PYTHONHOME=
if defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH%
if not defined _OLD_VIRTUAL_PATH set _OLD_VIRTUAL_PATH=%PATH%
-set "PATH=%VIRTUAL_ENV%\Scripts;%PATH%"
-set "VIRTUAL_ENV_PROMPT=venv1"
+set PATH=%VIRTUAL_ENV%\Scripts;%PATH%
+set VIRTUAL_ENV_PROMPT=(venv1)
:END
if defined _OLD_CODEPAGE (
diff --git a/venv1/Scripts/pip.exe b/venv1/Scripts/pip.exe
index 94514627..74156a66 100644
Binary files a/venv1/Scripts/pip.exe and b/venv1/Scripts/pip.exe differ
diff --git a/venv1/Scripts/pip3.exe b/venv1/Scripts/pip3.exe
index 94514627..74156a66 100644
Binary files a/venv1/Scripts/pip3.exe and b/venv1/Scripts/pip3.exe differ
diff --git a/venv1/Scripts/python.exe b/venv1/Scripts/python.exe
index 29c8442f..0c68b4c6 100644
Binary files a/venv1/Scripts/python.exe and b/venv1/Scripts/python.exe differ
diff --git a/venv1/Scripts/pythonw.exe b/venv1/Scripts/pythonw.exe
index f73174c1..01861b43 100644
Binary files a/venv1/Scripts/pythonw.exe and b/venv1/Scripts/pythonw.exe differ
diff --git a/venv1/pyvenv.cfg b/venv1/pyvenv.cfg
index 11f91eec..849037da 100644
--- a/venv1/pyvenv.cfg
+++ b/venv1/pyvenv.cfg
@@ -1,5 +1,5 @@
-home = C:\Users\Pooja\AppData\Local\Microsoft\WindowsApps\PythonSoftwareFoundation.Python.3.13_qbz5n2kfra8p0
+home = C:\Users\D S MOHANTO JULLIET\AppData\Local\Programs\Python\Python311
include-system-site-packages = false
-version = 3.13.12
-executable = C:\Users\Pooja\AppData\Local\Microsoft\WindowsApps\PythonSoftwareFoundation.Python.3.13_qbz5n2kfra8p0\python.exe
-command = C:\Users\Pooja\AppData\Local\Microsoft\WindowsApps\PythonSoftwareFoundation.Python.3.13_qbz5n2kfra8p0\python.exe -m venv C:\Users\Pooja\Downloads\Achievement-Management-System\venv1
+version = 3.11.4
+executable = C:\Users\D S MOHANTO JULLIET\AppData\Local\Programs\Python\Python311\python.exe
+command = C:\Users\D S MOHANTO JULLIET\AppData\Local\Programs\Python\Python311\python.exe -m venv C:\Users\D S MOHANTO JULLIET\Achievement-Management-System\venv1