86e65d86fb
Update to 20.2.3 With the increased use of %pyproject_wheel we need an up to date pip Needs new package python-csv23 for testing OBS-URL: https://build.opensuse.org/request/show/841036 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pip?expand=0&rev=82
70 lines
2.8 KiB
Diff
70 lines
2.8 KiB
Diff
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
|
|
-
|
|
-
|
|
-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")
|