Merge pull request #8045 from pradyunsg/pytoml-to-toml

Switch from `pytoml` to `toml`
pypa · Apr 14, 2020 · e40d267 · e40d267
2 parents 6a244de + 8b35958
commit e40d267
Show file tree

Hide file tree

Showing 24 changed files with 2,332 additions and 597 deletions.
diff --git a/news/pytoml.vendor b/news/pytoml.vendor
@@ -0,0 +1 @@
+Drop ``pytoml`` from vendored libaries.
diff --git a/news/toml.vendor b/news/toml.vendor
@@ -0,0 +1 @@
+Add ``toml`` 0.10.0 to vendored libraries.
diff --git a/src/pip/_internal/pyproject.py b/src/pip/_internal/pyproject.py
@@ -5,7 +5,7 @@
 import sys
 from collections import namedtuple
 
-from pip._vendor import pytoml, six
+from pip._vendor import six, toml
 from pip._vendor.packaging.requirements import InvalidRequirement, Requirement
 
 from pip._internal.exceptions import InstallationError
@@ -72,7 +72,7 @@ def load_pyproject_toml(
 
     if has_pyproject:
         with io.open(pyproject_toml, encoding="utf-8") as f:
-            pp_toml = pytoml.load(f)
+            pp_toml = toml.load(f)
         build_system = pp_toml.get("build-system")
     else:
         build_system = None

diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
@@ -75,7 +75,6 @@ def vendored(modulename):
     vendored("pep517")
     vendored("pkg_resources")
     vendored("progress")
-    vendored("pytoml")
     vendored("retrying")
     vendored("requests")
     vendored("requests.exceptions")
@@ -108,4 +107,7 @@ def vendored(modulename):
     vendored("requests.packages.urllib3.util.timeout")
     vendored("requests.packages.urllib3.util.url")
     vendored("resolvelib")
+    vendored("toml")
+    vendored("toml.encoder")
+    vendored("toml.decoder")
     vendored("urllib3")
diff --git a/src/pip/_vendor/pep517/build.py b/src/pip/_vendor/pep517/build.py
@@ -3,7 +3,7 @@
 import argparse
 import logging
 import os
-import toml
+from pip._vendor import toml
 import shutil
 
 from .envbuild import BuildEnvironment

diff --git a/src/pip/_vendor/pep517/check.py b/src/pip/_vendor/pep517/check.py
@@ -4,7 +4,7 @@
 import logging
 import os
 from os.path import isfile, join as pjoin
-from toml import TomlDecodeError, load as toml_load
+from pip._vendor.toml import TomlDecodeError, load as toml_load
 import shutil
 from subprocess import CalledProcessError
 import sys

diff --git a/src/pip/_vendor/pep517/envbuild.py b/src/pip/_vendor/pep517/envbuild.py
@@ -3,7 +3,7 @@
 
 import os
 import logging
-import toml
+from pip._vendor import toml
 import shutil
 from subprocess import check_call
 import sys

diff --git a/src/pip/_vendor/pytoml.pyi b/src/pip/_vendor/pytoml.pyi
diff --git a/src/pip/_vendor/pytoml/__init__.py b/src/pip/_vendor/pytoml/__init__.py
diff --git a/src/pip/_vendor/pytoml/core.py b/src/pip/_vendor/pytoml/core.py