]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Use tomllib on Python 3.11 (#2903)
authorShantanu <12621235+hauntsaninja@users.noreply.github.com>
Tue, 8 Mar 2022 16:47:51 +0000 (08:47 -0800)
committerGitHub <noreply@github.com>
Tue, 8 Mar 2022 16:47:51 +0000 (08:47 -0800)
CHANGES.md
setup.py
src/black/files.py

index 4264e631fab600f826f2bddee68f9623561d5cb7..edca0dcdad4acebaeda7a6345f67d294cbf3f5cc 100644 (file)
@@ -48,6 +48,9 @@
 
 <!-- Changes to how Black is packaged, such as dependency requirements -->
 
 
 <!-- Changes to how Black is packaged, such as dependency requirements -->
 
+- On Python 3.11 and newer, use the standard library's `tomllib` instead of `tomli`
+  (#2903)
+
 ### Parser
 
 - Black can now parse starred expressions in the target of `for` and `async for`
 ### Parser
 
 - Black can now parse starred expressions in the target of `for` and `async for`
index 466f1a9c3a63a1cb2905985bcc8f059e5ed048d3..6b5b957e96f955b8db227fee0bcc5142b82974f8 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -99,7 +99,7 @@ setup(
     install_requires=[
         "click>=8.0.0",
         "platformdirs>=2",
     install_requires=[
         "click>=8.0.0",
         "platformdirs>=2",
-        "tomli>=1.1.0",
+        "tomli>=1.1.0; python_version < '3.11'",
         "typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'",
         "pathspec>=0.9.0",
         "dataclasses>=0.6; python_version < '3.7'",
         "typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'",
         "pathspec>=0.9.0",
         "dataclasses>=0.6; python_version < '3.7'",
index b6c1cf3ffe15bb3479061d49e7daaa47c8e133fb..52c77c63346ce36eddb6417cdab8061994567cbb 100644 (file)
@@ -20,7 +20,11 @@ from typing import (
 from mypy_extensions import mypyc_attr
 from pathspec import PathSpec
 from pathspec.patterns.gitwildmatch import GitWildMatchPatternError
 from mypy_extensions import mypyc_attr
 from pathspec import PathSpec
 from pathspec.patterns.gitwildmatch import GitWildMatchPatternError
-import tomli
+
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
 
 from black.output import err
 from black.report import Report
 
 from black.output import err
 from black.report import Report
@@ -97,10 +101,10 @@ def find_pyproject_toml(path_search_start: Tuple[str, ...]) -> Optional[str]:
 def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
     """Parse a pyproject toml file, pulling out relevant parts for Black
 
 def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
     """Parse a pyproject toml file, pulling out relevant parts for Black
 
-    If parsing fails, will raise a tomli.TOMLDecodeError
+    If parsing fails, will raise a tomllib.TOMLDecodeError
     """
     with open(path_config, "rb") as f:
     """
     with open(path_config, "rb") as f:
-        pyproject_toml = tomli.load(f)
+        pyproject_toml = tomllib.load(f)
     config = pyproject_toml.get("tool", {}).get("black", {})
     return {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}
 
     config = pyproject_toml.get("tool", {}).get("black", {})
     return {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}