1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
diff --git a/pipenv/project.py b/pipenv/project.py
index ed43cf2bc..903667639 100644
--- a/pipenv/project.py
+++ b/pipenv/project.py
@@ -13,6 +13,13 @@ import urllib.parse
from json.decoder import JSONDecodeError
from pathlib import Path
+import click, tomlkit
+
+try:
+ import tomllib as toml
+except ImportError:
+ 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
diff --git a/pipenv/utils/toml.py b/pipenv/utils/toml.py
index d4157d01c..27d9975ae 100644
--- a/pipenv/utils/toml.py
+++ b/pipenv/utils/toml.py
@@ -1,4 +1,9 @@
-from pipenv.vendor import toml, tomlkit
+try:
+ import tomllib as toml
+except ImportError:
+ import tomli as toml
+
+import tomlkit
def cleanup_toml(tml):
diff --git a/pipenv/vendor/dparse/parser.py b/pipenv/vendor/dparse/parser.py
index faaad2e8e..4c59474e9 100644
--- a/pipenv/vendor/dparse/parser.py
+++ b/pipenv/vendor/dparse/parser.py
@@ -10,6 +10,11 @@ from io import StringIO
from configparser import ConfigParser, NoOptionError
from pathlib import PurePath
+try:
+ import tomllib as toml
+except ImportError:
+ import tomli as toml
+
from .errors import MalformedDependencyFileError
from .regex import HASH_REGEX
@@ -17,7 +22,6 @@ 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
diff --git a/pipenv/vendor/dparse/updater.py b/pipenv/vendor/dparse/updater.py
index 7b7ba9a53..fe20a213f 100644
--- a/pipenv/vendor/dparse/updater.py
+++ b/pipenv/vendor/dparse/updater.py
@@ -3,9 +3,13 @@ from __future__ import absolute_import, print_function, unicode_literals
import re
import json
import tempfile
-import pipenv.vendor.toml as toml
import os
+try:
+ import tomllib as toml
+except ImportError:
+ import tomli as toml
+
class RequirementsTXTUpdater(object):
SUB_REGEX = r"^{}(?=\s*\r?\n?$)"
|
