python-pip/pip-shipped-requests-cabundle.patch

70 lines
2.8 KiB
Diff
Raw Normal View History

Index: pip-20.2.3/src/pip/_vendor/certifi/core.py
===================================================================
--- pip-20.2.3.orig/src/pip/_vendor/certifi/core.py
+++ pip-20.2.3/src/pip/_vendor/certifi/core.py
@@ -5,56 +5,18 @@ certifi.py
~~~~~~~~~~
This module returns the installation location of cacert.pem or its contents.
-"""
-import os
-try:
- from importlib.resources import path as get_path, read_text
+Patched by openSUSE: return the system bundle
+"""
- _CACERT_CTX = None
- _CACERT_PATH = None
+def read_text(_module=None, _path=None, encoding="ascii"):
+ with open(where(), "r", encoding=encoding) as data:
+ return data.read()
- def where():
- # This is slightly terrible, but we want to delay extracting the file
- # in cases where we're inside of a zipimport situation until someone
- # actually calls where(), but we don't want to re-extract the file
- # on every call of where(), so we'll do it once then store it in a
- # global variable.
- global _CACERT_CTX
- global _CACERT_PATH
- if _CACERT_PATH is None:
- # This is slightly janky, the importlib.resources API wants you to
- # manage the cleanup of this file, so it doesn't actually return a
- # path, it returns a context manager that will give you the path
- # when you enter it and will do any cleanup when you leave it. In
- # the common case of not needing a temporary file, it will just
- # return the file system location and the __exit__() is a no-op.
- #
- # We also have to hold onto the actual context manager, because
- # it will do the cleanup whenever it gets garbage collected, so
- # we will also store that at the global level as well.
- _CACERT_CTX = get_path("pip._vendor.certifi", "cacert.pem")
- _CACERT_PATH = str(_CACERT_CTX.__enter__())
-
- return _CACERT_PATH
-
Accepting request 702370 from home:mcepl:branches:devel:languages:python - Update to version 19.1.1+git.1557521541.a731e7e3: * Docs: capitalize "URL" * Upgrade Sphinx version for Read the Docs (#6477) * Upwrap import * Remove utils/packaging.py's dependence on the current environment. * Improve import error handling Fix --no-index usage Fix missing type annotation type * Rename _link_package_versions() to evaluate_link(). * Move _link_package_versions() to CandidateEvaluator. * Refine return type of _package_versions() and find_all_candidates(). * Fix mismerged import * Issue #5948: Enable keyring support * Move run_with_log_command() after run_stderr_with_prefix(). * Change to never allow logging errors during tests. * Add failing test. * Respect --global-option and --install-option for VCS installs. - Start using upstream git checkout instead of the released tarballs so we can get tests/ directory (gh#pypa/pip#6258). - Enable tests. - Update to 19.1.1: - Restore pyproject.toml handling to how it was with pip 19.0.3 to prevent the need to add --no-use-pep517 when installing in editable mode. (#6434) - Fix a regression that caused @ to be quoted in pypiserver links. This interfered with parsing the revision string from VCS urls. (#6440) - Configuration files may now also be stored under sys.prefix (#5060) - Avoid creating an unnecessary local clone of a Bazaar branch when exporting. (#5443) OBS-URL: https://build.opensuse.org/request/show/702370 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pip?expand=0&rev=65
2019-05-11 19:29:32 +02:00
-
-except ImportError:
- # This fallback will work for Python versions prior to 3.7 that lack the
- # importlib.resources module but relies on the existing `where` function
- # so won't address issues with environments like PyOxidizer that don't set
- # __file__ on modules.
- def read_text(_module, _path, encoding="ascii"):
- with open(where(), "r", encoding=encoding) as data:
- return data.read()
-
- # If we don't have importlib.resources, then we will just do the old logic
- # of assuming we're on the filesystem and munge the path directly.
- def where():
- f = os.path.dirname(__file__)
- return os.path.join(f, "cacert.pem")
+def where():
+ return "/etc/ssl/ca-bundle.pem"
def contents():
- return read_text("certifi", "cacert.pem", encoding="ascii")
+ return read_text(encoding="ascii")