python313Packages.certifi: 2025.4.26 -> 2025.6.15 (#420216)
* python312Packages.certifi: 2025.4.26 -> 2025.6.15 * python312Packages.certifi: upstream minimum * Update pkgs/development/python-modules/certifi/default.nix --------- Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git a/certifi/core.py b/certifi/core.py
|
||||
index 91f538b..1110ce0 100644
|
||||
index 1c9661c..7039be3 100644
|
||||
--- a/certifi/core.py
|
||||
+++ b/certifi/core.py
|
||||
@@ -4,6 +4,7 @@ certifi.py
|
||||
@@ -41,8 +41,8 @@ index 91f538b..1110ce0 100644
|
||||
+ return open(_CACERT_PATH, encoding="utf-8").read()
|
||||
return files("certifi").joinpath("cacert.pem").read_text(encoding="ascii")
|
||||
|
||||
elif sys.version_info >= (3, 7):
|
||||
@@ -51,7 +63,7 @@ elif sys.version_info >= (3, 7):
|
||||
else:
|
||||
@@ -51,7 +63,7 @@ else:
|
||||
from importlib.resources import path as get_path, read_text
|
||||
|
||||
_CACERT_CTX = None
|
||||
@@ -51,37 +51,3 @@ index 91f538b..1110ce0 100644
|
||||
|
||||
def where() -> str:
|
||||
# This is slightly terrible, but we want to delay extracting the
|
||||
@@ -80,7 +92,9 @@ elif sys.version_info >= (3, 7):
|
||||
return _CACERT_PATH
|
||||
|
||||
def contents() -> str:
|
||||
- return read_text("certifi", "cacert.pem", encoding="ascii")
|
||||
+ if _CACERT_PATH is not None:
|
||||
+ return open(_CACERT_PATH, encoding="utf-8").read()
|
||||
+ return read_text("certifi", "cacert.pem", encoding="utf-8")
|
||||
|
||||
else:
|
||||
import os
|
||||
@@ -90,6 +104,8 @@ else:
|
||||
Package = Union[types.ModuleType, str]
|
||||
Resource = Union[str, "os.PathLike"]
|
||||
|
||||
+ _CACERT_PATH = get_cacert_path_from_environ()
|
||||
+
|
||||
# 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
|
||||
@@ -108,7 +124,13 @@ else:
|
||||
def where() -> str:
|
||||
f = os.path.dirname(__file__)
|
||||
|
||||
+ if _CACERT_PATH is not None:
|
||||
+ return _CACERT_PATH
|
||||
+
|
||||
return os.path.join(f, "cacert.pem")
|
||||
|
||||
def contents() -> str:
|
||||
+ if _CACERT_PATH is not None:
|
||||
+ with open(_CACERT_PATH, encoding="utf-8") as data:
|
||||
+ return data.read()
|
||||
return read_text("certifi", "cacert.pem", encoding="ascii")
|
||||
|
||||
Reference in New Issue
Block a user