59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
|
From c8ed737d0390497b63c410a8239fea425c62a757 Mon Sep 17 00:00:00 2001
|
||
|
|
From: lingjuer <zhangchenglin@kylinos.cn>
|
||
|
|
Date: Wed, 26 Jul 2023 10:20:57 +0800
|
||
|
|
Subject: [PATCH] backport-requests-2.31.0-system-certs
|
||
|
|
|
||
|
|
---
|
||
|
|
requests/certs.py | 7 ++++++-
|
||
|
|
setup.cfg | 1 -
|
||
|
|
setup.py | 2 +-
|
||
|
|
3 files changed, 7 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/requests/certs.py b/requests/certs.py
|
||
|
|
index be422c3..1795e1c 100644
|
||
|
|
--- a/requests/certs.py
|
||
|
|
+++ b/requests/certs.py
|
||
|
|
@@ -10,8 +10,13 @@ only one — the one from the certifi package.
|
||
|
|
If you are packaging Requests, e.g., for a Linux distribution or a managed
|
||
|
|
environment, you can change the definition of where() to return a separately
|
||
|
|
packaged CA bundle.
|
||
|
|
+
|
||
|
|
+This OpenEuler-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided
|
||
|
|
+by the ca-certificates RPM package.
|
||
|
|
"""
|
||
|
|
-from certifi import where
|
||
|
|
+def where():
|
||
|
|
+ """Return the absolute path to the system CA bundle."""
|
||
|
|
+ return '/etc/pki/tls/certs/ca-bundle.crt'
|
||
|
|
|
||
|
|
if __name__ == "__main__":
|
||
|
|
print(where())
|
||
|
|
diff --git a/setup.cfg b/setup.cfg
|
||
|
|
index ea45aaf..056b065 100644
|
||
|
|
--- a/setup.cfg
|
||
|
|
+++ b/setup.cfg
|
||
|
|
@@ -4,7 +4,6 @@ provides-extra =
|
||
|
|
socks
|
||
|
|
use_chardet_on_py3
|
||
|
|
requires-dist =
|
||
|
|
- certifi>=2017.4.17
|
||
|
|
charset_normalizer>=2,<4
|
||
|
|
idna>=2.5,<4
|
||
|
|
urllib3>=1.21.1,<1.27
|
||
|
|
diff --git a/setup.py b/setup.py
|
||
|
|
index 0123545..a1a50a3 100755
|
||
|
|
--- a/setup.py
|
||
|
|
+++ b/setup.py
|
||
|
|
@@ -62,7 +62,7 @@ requires = [
|
||
|
|
"charset_normalizer>=2,<4",
|
||
|
|
"idna>=2.5,<4",
|
||
|
|
"urllib3>=1.21.1,<3",
|
||
|
|
- "certifi>=2017.4.17",
|
||
|
|
+
|
||
|
|
]
|
||
|
|
test_requirements = [
|
||
|
|
"pytest-httpbin==2.0.0",
|
||
|
|
--
|
||
|
|
2.39.1
|
||
|
|
|