From eba78d63e3a4b181153a011caec2a3e50eecfee0 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 24 May 2020 19:57:55 -0400 Subject: Remove superfluous RequirementParseError. Ref #1832. --- pkg_resources/__init__.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'pkg_resources') diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index edd3d2e8..56be3c22 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -3068,11 +3068,6 @@ def issue_warning(*args, **kw): warnings.warn(stacklevel=level + 1, *args, **kw) -class RequirementParseError(ValueError): - def __str__(self): - return ' '.join(self.args) - - def parse_requirements(strs): """Yield ``Requirement`` objects for each specification in `strs` @@ -3098,10 +3093,7 @@ def parse_requirements(strs): class Requirement(packaging.requirements.Requirement): def __init__(self, requirement_string): """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!""" - try: - super(Requirement, self).__init__(requirement_string) - except packaging.requirements.InvalidRequirement as e: - raise RequirementParseError(str(e)) + super(Requirement, self).__init__(requirement_string) self.unsafe_name = self.name project_name = safe_name(self.name) self.project_name, self.key = project_name, project_name.lower() -- cgit v1.2.1 From 09df3c7adba9a1e687151805b61aec72f6c8b13f Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 15 Jun 2020 17:45:10 -0400 Subject: Add a compatibility wrapper, so downstream consumers trapping a RequirementParseError will now trap an InvalidRequirement, allowing transition to only trapping an InvalidRequirement. --- pkg_resources/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkg_resources') diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 56be3c22..1433409a 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -3090,6 +3090,10 @@ def parse_requirements(strs): yield Requirement(line) +class RequirementParseError(packaging.requirements.InvalidRequirement): + "Compatibility wrapper for InvalidRequirement" + + class Requirement(packaging.requirements.Requirement): def __init__(self, requirement_string): """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!""" -- cgit v1.2.1