Replaced vendored toml with tomli

news/5678.vendor.rst

@@ -0,0 +1 @@
+Drop old vendored toml library. Use stdlib tomllib or tomli instead.

pipenv/project.py

@@ -13,6 +13,11 @@
 from json.decoder import JSONDecodeError
 from pathlib import Path
 
+try:
+    import tomllib as toml
+except ImportError:
+    from pipenv.vendor import tomli as toml
+
 from pipenv.cmdparse import Script
 from pipenv.environment import Environment
 from pipenv.environments import Setting, is_in_virtualenv, normalize_pipfile_path
@@ -40,7 +45,7 @@
     system_which,
 )
 from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
-from pipenv.vendor import click, plette, toml, tomlkit
+from pipenv.vendor import click, plette, tomlkit
 from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
 
 try:
@@ -176,9 +181,9 @@ def __init__(self, python_version=None, chdir=True):
                 "name": "pypi",
             }
 
-        default_sources_toml = f"[[source]]\n{toml.dumps(self.default_source)}"
+        default_sources_toml = f"[[source]]\n{tomlkit.dumps(self.default_source)}"
         for pip_conf_index in pip_conf_indexes:
-            default_sources_toml += f"\n\n[[source]]\n{toml.dumps(pip_conf_index)}"
+            default_sources_toml += f"\n\n[[source]]\n{tomlkit.dumps(pip_conf_index)}"
         plette.pipfiles.DEFAULT_SOURCE_TOML = default_sources_toml
 
         # Hack to skip this during pipenv run, or -r.

pipenv/utils/toml.py

@@ -1,4 +1,9 @@
-from pipenv.vendor import toml, tomlkit
+try:
+    import tomllib as toml
+except ImportError:
+    from pipenv.vendor import tomli as toml
+
+from pipenv.vendor import tomlkit
 
 
 def cleanup_toml(tml):

pipenv/vendor/dparse/parser.py

@@ -10,14 +10,18 @@
 from configparser import ConfigParser, NoOptionError
 from pathlib import PurePath
 
+try:
+    import tomllib as toml
+except ImportError:
+    from pipenv.vendor import tomli as toml
+
 from .errors import MalformedDependencyFileError
 from .regex import HASH_REGEX
 
 from .dependencies import DependencyFile, Dependency
 from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement,\
     InvalidRequirement
 from . import filetypes
-import pipenv.vendor.toml as toml
 from pipenv.patched.pip._vendor.packaging.specifiers import SpecifierSet
 from pipenv.patched.pip._vendor.packaging.version import Version, InvalidVersion
 import json

pipenv/vendor/dparse/updater.py

@@ -3,9 +3,13 @@
 import re
 import json
 import tempfile
-import pipenv.vendor.toml as toml
 import os
 
+try:
+    import tomllib as toml
+except ImportError:
+    from pipenv.vendor import tomli as toml
+
 
 class RequirementsTXTUpdater(object):
     SUB_REGEX = r"^{}(?=\s*\r?\n?$)"