maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Python 3.12 compatibility (#5157)

Browse source
This commit is contained in:
David Lord 2023-06-07 13:21:49 -07:00 • committed by GitHub
commit 9930b0fe8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.rst
View file

@ -3,6 +3,9 @@ Version 2.3.3
Unreleased Unreleased
- Python 3.12 compatibility.
- Update Werkzeug requirement to >=2.3.5.
Version 2.3.2 Version 2.3.2
------------- -------------

2
pyproject.toml
View file

@ -19,7 +19,7 @@ classifiers = [
] ]
requires-python = ">=3.8" requires-python = ">=3.8"
dependencies = [ dependencies = [
"Werkzeug>=2.3.3", "Werkzeug>=2.3.5",
"Jinja2>=3.1.2", "Jinja2>=3.1.2",
"itsdangerous>=2.1.2", "itsdangerous>=2.1.2",
"click>=8.1.3", "click>=8.1.3",

2
requirements/tests-pallets-min.in
View file

@ -1,4 +1,4 @@
Werkzeug==2.3.3 Werkzeug==2.3.5
Jinja2==3.1.2 Jinja2==3.1.2
MarkupSafe==2.1.1 MarkupSafe==2.1.1
itsdangerous==2.1.2 itsdangerous==2.1.2

4
requirements/tests-pallets-min.txt
View file

@ -1,4 +1,4 @@
# SHA1:0b58503b99aabc227b7f39357216d676d9987a12 # SHA1:c4bfd085a9d4e81c583daf70671803d5e388c656
# #
# This file is autogenerated by pip-compile-multi # This file is autogenerated by pip-compile-multi
# To update, run: # To update, run:
@ -18,5 +18,5 @@ markupsafe==2.1.1
# -r requirements/tests-pallets-min.in # -r requirements/tests-pallets-min.in
# jinja2 # jinja2
# werkzeug # werkzeug
werkzeug==2.3.3 werkzeug==2.3.5
# via -r requirements/tests-pallets-min.in # via -r requirements/tests-pallets-min.in

5
src/flask/helpers.py
View file

@ -1,7 +1,7 @@
from __future__ import annotations from __future__ import annotations
import importlib.util
import os import os
import pkgutil
import socket import socket
import sys import sys
import typing as t import typing as t
@ -575,7 +575,8 @@ def get_root_path(import_name: str) -> str:
return os.path.dirname(os.path.abspath(mod.__file__)) return os.path.dirname(os.path.abspath(mod.__file__))
# Next attempt: check the loader. # Next attempt: check the loader.
loader = pkgutil.get_loader(import_name) spec = importlib.util.find_spec(import_name)
loader = spec.loader if spec is not None else None
# Loader does not exist or we're referring to an unloaded main # Loader does not exist or we're referring to an unloaded main
# module or a main module without path (interactive sessions), go # module or a main module without path (interactive sessions), go

4
src/flask/scaffold.py
View file

@ -3,7 +3,6 @@ from __future__ import annotations
import importlib.util import importlib.util
import os import os
import pathlib import pathlib
import pkgutil
import sys import sys
import typing as t import typing as t
from collections import defaultdict from collections import defaultdict
@ -856,7 +855,8 @@ def _find_package_path(import_name):
return os.path.dirname(root_spec.origin) return os.path.dirname(root_spec.origin)
# we were unable to find the `package_path` using PEP 451 loaders # we were unable to find the `package_path` using PEP 451 loaders
loader = pkgutil.get_loader(root_mod_name) spec = importlib.util.find_spec(root_mod_name)
loader = spec.loader if spec is not None else None
if loader is None or root_mod_name == "__main__": if loader is None or root_mod_name == "__main__":
# import name is not found, or interactive/main module # import name is not found, or interactive/main module