From 237496c385222d62d507959ca8d7aa7f1a469615 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 11 May 2022 10:29:20 +0100 Subject: [PATCH 1/4] Fix deprecation warning on Python 3.11 Fixes #192. --- .github/workflows/ci.yml | 10 +++++-- certifi/core.py | 65 +++++++++++++++++++++++----------------- setup.py | 5 ++-- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5e1acca..f139b1e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] - + python-version: + - "3.7" + - "3.8" + - "3.9" + - "3.10" + - "3.11-dev" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -36,4 +40,4 @@ jobs: python -m pip install pytest - name: Test with pytest run: | - pytest + python -W error -m pytest diff --git a/certifi/core.py b/certifi/core.py index 497d938d..47f142ef 100644 --- a/certifi/core.py +++ b/certifi/core.py @@ -4,12 +4,12 @@ This module returns the installation location of cacert.pem or its contents. """ -import os -import types -from typing import Union +import sys -try: - from importlib.resources import path as get_path, read_text + +if sys.version_info >= (3, 9): + + from importlib.resources import as_file, files _CACERT_CTX = None _CACERT_PATH = None @@ -33,36 +33,45 @@ def where() -> str: # 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("certifi", "cacert.pem") + _CACERT_CTX = as_file(files("certifi").joinpath("cacert.pem")) _CACERT_PATH = str(_CACERT_CTX.__enter__()) return _CACERT_PATH + def contents() -> str: + return files("certifi").joinpath("cacert.pem").read_text(encoding="ascii") + +else: -except ImportError: - Package = Union[types.ModuleType, str] - Resource = Union[str, "os.PathLike"] + from importlib.resources import path as get_path, read_text - # 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( - package: Package, - resource: Resource, - encoding: str = 'utf-8', - errors: str = 'strict' - ) -> str: - with open(where(), encoding=encoding) as data: - return data.read() + _CACERT_CTX = None + _CACERT_PATH = None - # 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() -> str: - f = os.path.dirname(__file__) - - return os.path.join(f, "cacert.pem") + # 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("certifi", "cacert.pem") + _CACERT_PATH = str(_CACERT_CTX.__enter__()) + return _CACERT_PATH -def contents() -> str: - return read_text("certifi", "cacert.pem", encoding="ascii") + def contents() -> str: + return read_text("certifi", "cacert.pem", encoding="ascii") diff --git a/setup.py b/setup.py index 5bad7076..bed9358a 100755 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ include_package_data=True, zip_safe=False, license='MPL-2.0', - python_requires=">=3.6", + python_requires=">=3.7", classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', @@ -54,11 +54,12 @@ 'Natural Language :: English', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ], project_urls={ 'Source': 'https://github.com/certifi/python-certifi', From 442c281d850b4841973deeb0a03f863946ff785f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 15 Jul 2022 16:09:23 +0300 Subject: [PATCH 2/4] Retain support for Python 3.6 Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- .github/workflows/ci.yml | 1 + certifi/core.py | 30 +++++++++++++++++++++++++++++- setup.py | 3 ++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f139b1e1..072f0de1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,7 @@ jobs: strategy: matrix: python-version: + - "3.6" - "3.7" - "3.8" - "3.9" diff --git a/certifi/core.py b/certifi/core.py index 47f142ef..9842899d 100644 --- a/certifi/core.py +++ b/certifi/core.py @@ -41,7 +41,7 @@ def where() -> str: def contents() -> str: return files("certifi").joinpath("cacert.pem").read_text(encoding="ascii") -else: +elif sys.version_info >= (3, 7): from importlib.resources import path as get_path, read_text @@ -75,3 +75,31 @@ def where() -> str: def contents() -> str: return read_text("certifi", "cacert.pem", encoding="ascii") + +else: + import os + import types + from typing import Union + + Package = Union[types.ModuleType, str] + Resource = Union[str, "os.PathLike"] + + # 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( + package: Package, + resource: Resource, + encoding: str = 'utf-8', + errors: str = 'strict' + ) -> str: + with open(where(), 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() -> str: + f = os.path.dirname(__file__) + + return os.path.join(f, "cacert.pem") diff --git a/setup.py b/setup.py index bed9358a..da0cf1dd 100755 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ include_package_data=True, zip_safe=False, license='MPL-2.0', - python_requires=">=3.7", + python_requires=">=3.6", classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', @@ -55,6 +55,7 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', From 57a72fe7f56f4516ac30be0d8ca94589b7fae0db Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 15 Jul 2022 16:11:11 +0300 Subject: [PATCH 3/4] Bump actions versions --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 072f0de1..1b6157d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 - name: Install dependencies run: pip install mypy - name: Run mypy @@ -30,9 +30,9 @@ jobs: - "3.10" - "3.11-dev" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install test dependencies From 2a3d613fe468e77665e63842a8622e5e0a9b5b29 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 15 Jul 2022 16:19:15 +0300 Subject: [PATCH 4/4] Use same 'where' for 3.6 and 3.7-3.10 --- certifi/core.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/certifi/core.py b/certifi/core.py index 9842899d..cfd42ce3 100644 --- a/certifi/core.py +++ b/certifi/core.py @@ -103,3 +103,6 @@ def where() -> str: f = os.path.dirname(__file__) return os.path.join(f, "cacert.pem") + + def contents() -> str: + return read_text("certifi", "cacert.pem", encoding="ascii")