Merge pull request #5750 from pypa/vendor-bump-dparse

Vendor: bump dparse to 0.6.3

news/5750.removal.rst

@@ -0,0 +1 @@
+Bump dparse to 0.6.3

pipenv/vendor/dparse/__init__.py

@@ -4,6 +4,6 @@ from __future__ import unicode_literals, absolute_import
 
 __author__ = """Jannis Gebauer"""
 __email__ = 'support@pyup.io'
-__version__ = '0.6.2'
+__version__ = '0.6.3'
 
 from .parser import parse  # noqa

pipenv/vendor/dparse/parser.py

@@ -4,17 +4,13 @@ from __future__ import unicode_literals, absolute_import
 import os
 from collections import OrderedDict
 import re
+import sys
 
 from io import StringIO
 
 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
 
@@ -26,6 +22,11 @@ from pipenv.patched.pip._vendor.packaging.specifiers import SpecifierSet
 from pipenv.patched.pip._vendor.packaging.version import Version, InvalidVersion
 import json
 
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import pipenv.vendor.tomli as tomllib
+
 
 # this is a backport from setuptools 26.1
 def setuptools_parse_requirements_backport(strs):  # pragma: no cover
@@ -360,7 +361,7 @@ class PipfileParser(Parser):
         :return:
         """
         try:
-            data = toml.loads(self.obj.content, _dict=OrderedDict)
+            data = tomllib.loads(self.obj.content)
             if data:
                 for package_type in ['packages', 'dev-packages']:
                     if package_type in data:
@@ -378,7 +379,7 @@ class PipfileParser(Parser):
                                     section=package_type
                                 )
                             )
-        except (toml.TomlDecodeError, IndexError):
+        except (tomllib.TOMLDecodeError, IndexError):
             pass
 
 
@@ -447,7 +448,7 @@ class PoetryLockParser(Parser):
         Parse a poetry.lock
         """
         try:
-            data = toml.loads(self.obj.content, _dict=OrderedDict)
+            data = tomllib.loads(self.obj.content)
             pkg_key = 'package'
             if data:
                 try:
@@ -475,7 +476,7 @@ class PoetryLockParser(Parser):
                             section=section
                         )
                     )
-        except (toml.TomlDecodeError, IndexError) as e:
+        except (tomllib.TOMLDecodeError, IndexError) as e:
             raise MalformedDependencyFileError(info=str(e))
 
 

pipenv/vendor/dparse/updater.py

@@ -4,11 +4,12 @@ import re
 import json
 import tempfile
 import os
+import sys
 
-try:
-    import tomllib as toml
-except ImportError:
-    from pipenv.vendor import tomli as toml
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import pipenv.vendor.tomli as tomllib
 
 
 class RequirementsTXTUpdater(object):
@@ -83,7 +84,7 @@ class SetupCFGUpdater(CondaYMLUpdater):
 class PipfileUpdater(object):
     @classmethod
     def update(cls, content, dependency, version, spec="==", hashes=()):
-        data = toml.loads(content)
+        data = tomllib.loads(content)
         if data:
             for package_type in ['packages', 'dev-packages']:
                 if package_type in data:

pipenv/vendor/vendor.txt

@@ -1,7 +1,7 @@
 click-didyoumean==0.3.0
 click==8.1.3
 colorama==0.4.6
-dparse==0.6.2
+dparse==0.6.3
 markupsafe==2.1.2
 pep517==0.13.0
 pexpect==4.8.0