Skip to content

Commit 01396f2

Browse files
committed
fix: standardize repr style
Signed-off-by: Henry Schreiner <henryfs@princeton.edu>
1 parent 2df7bdd commit 01396f2

16 files changed

Lines changed: 52 additions & 49 deletions

docs/markers.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Usage
1616
>>> from packaging.markers import Marker, UndefinedEnvironmentName
1717
>>> marker = Marker("python_version>'2'")
1818
>>> marker
19-
<Marker('python_version > "2"')>
19+
Marker('python_version > "2"')
2020
>>> # We can evaluate the marker to see if it is satisfied
2121
>>> marker.evaluate()
2222
True
@@ -27,11 +27,11 @@ Usage
2727
>>> # Multiple markers can be ANDed
2828
>>> and_marker = Marker("os_name=='a' and os_name=='b'")
2929
>>> and_marker
30-
<Marker('os_name == "a" and os_name == "b"')>
30+
Marker('os_name == "a" and os_name == "b"')
3131
>>> # Multiple markers can be ORed
3232
>>> or_marker = Marker("os_name=='a' or os_name=='b'")
3333
>>> or_marker
34-
<Marker('os_name == "a" or os_name == "b"')>
34+
Marker('os_name == "a" or os_name == "b"')
3535
>>> # Markers can be also used with extras, to pull in dependencies if
3636
>>> # a certain extra is being installed
3737
>>> extra = Marker('extra == "bar"')

docs/metadata.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Usage
3030
>>> parsed.name
3131
'packaging'
3232
>>> parsed.version
33-
<Version('24.0')>
33+
Version('24.0')
3434

3535

3636
Reference

docs/requirements.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Usage
1616
>>> from packaging.requirements import Requirement
1717
>>> simple_req = Requirement("name")
1818
>>> simple_req
19-
<Requirement('name')>
19+
Requirement('name')
2020
>>> simple_req.name
2121
'name'
2222
>>> simple_req.url is None
2323
True
2424
>>> simple_req.extras
2525
set()
2626
>>> simple_req.specifier
27-
<SpecifierSet('')>
27+
SpecifierSet('')
2828
>>> simple_req.marker is None
2929
True
3030
>>> # Requirements can be specified with extras, specifiers and markers
@@ -34,9 +34,9 @@ Usage
3434
>>> req.extras
3535
{'foo'}
3636
>>> req.specifier
37-
<SpecifierSet('<3,>=2')>
37+
SpecifierSet('<3,>=2')
3838
>>> req.marker
39-
<Marker('python_version > "2.0"')>
39+
Marker('python_version > "2.0"')
4040
>>> # Requirements can also be specified with a URL, but may not specify
4141
>>> # a version.
4242
>>> url_req = Requirement('name @ https://github.com/pypa ;os_name=="a"')
@@ -47,7 +47,7 @@ Usage
4747
>>> url_req.extras
4848
set()
4949
>>> url_req.marker
50-
<Marker('os_name == "a"')>
50+
Marker('os_name == "a"')
5151
>>> # You can do simple comparisons between requirement objects:
5252
>>> Requirement("packaging") == Requirement("packaging")
5353
True

docs/specifiers.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ Usage
1818
>>> from packaging.version import Version
1919
>>> spec1 = SpecifierSet("~=1.0")
2020
>>> spec1
21-
<SpecifierSet('~=1.0')>
21+
SpecifierSet('~=1.0')
2222
>>> spec2 = SpecifierSet(">=1.0")
2323
>>> spec2
24-
<SpecifierSet('>=1.0')>
24+
SpecifierSet('>=1.0')
2525
>>> # We can combine specifiers
2626
>>> combined_spec = spec1 & spec2
2727
>>> combined_spec
28-
<SpecifierSet('>=1.0,~=1.0')>
28+
SpecifierSet('>=1.0,~=1.0')
2929
>>> # We can also implicitly combine a string specifier
3030
>>> combined_spec &= "!=1.1"
3131
>>> combined_spec
32-
<SpecifierSet('!=1.1,>=1.0,~=1.0')>
32+
SpecifierSet('!=1.1,>=1.0,~=1.0')
3333
>>> # We can iterate over the SpecifierSet to recover the
3434
>>> # individual specifiers
3535
>>> sorted(combined_spec, key=str)
36-
[<Specifier('!=1.1')>, <Specifier('>=1.0')>, <Specifier('~=1.0')>]
36+
[Specifier('!=1.1'), Specifier('>=1.0'), Specifier('~=1.0')]
3737
>>> # Create a few versions to check for contains.
3838
>>> v1 = Version("1.0a5")
3939
>>> v2 = Version("1.0")
@@ -48,7 +48,7 @@ Usage
4848
>>> # Finally we can filter a list of versions to get only those which are
4949
>>> # contained within our specifier.
5050
>>> list(combined_spec.filter([v1, v2, "1.4"]))
51-
[<Version('1.0')>, '1.4']
51+
[Version('1.0'), '1.4']
5252

5353

5454
Reference

docs/version.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ Usage
1818
>>> v1 = parse("1.0a5")
1919
>>> v2 = Version("1.0")
2020
>>> v1
21-
<Version('1.0a5')>
21+
Version('1.0a5')
2222
>>> v2
23-
<Version('1.0')>
23+
Version('1.0')
2424
>>> v1 < v2
2525
True
2626
>>> v1.epoch

src/packaging/_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def __str__(self) -> str:
2222
return self.value
2323

2424
def __repr__(self) -> str:
25-
return f"<{self.__class__.__name__}({self.value!r})>"
25+
return f"{self.__class__.__name__}({self.value!r})"
2626

2727
def serialize(self) -> str:
2828
raise NotImplementedError

src/packaging/markers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ def __str__(self) -> str:
329329
return _format_marker(self._markers)
330330

331331
def __repr__(self) -> str:
332-
return f"<{self.__class__.__name__}({str(self)!r})>"
332+
return f"{self.__class__.__name__}({str(self)!r})"
333333

334334
def __hash__(self) -> int:
335335
return hash(str(self))

src/packaging/requirements.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def __str__(self) -> str:
7777
return "".join(self._iter_parts(self.name))
7878

7979
def __repr__(self) -> str:
80-
return f"<{self.__class__.__name__}({str(self)!r})>"
80+
return f"{self.__class__.__name__}({str(self)!r})"
8181

8282
def __hash__(self) -> int:
8383
return hash(tuple(self._iter_parts(canonicalize_name(self.name))))

src/packaging/specifiers.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -386,19 +386,19 @@ def __repr__(self) -> str:
386386
"""A representation of the Specifier that shows all internal state.
387387
388388
>>> Specifier('>=1.0.0')
389-
<Specifier('>=1.0.0')>
389+
Specifier('>=1.0.0')
390390
>>> Specifier('>=1.0.0', prereleases=False)
391-
<Specifier('>=1.0.0', prereleases=False)>
391+
Specifier('>=1.0.0', prereleases=False)
392392
>>> Specifier('>=1.0.0', prereleases=True)
393-
<Specifier('>=1.0.0', prereleases=True)>
393+
Specifier('>=1.0.0', prereleases=True)
394394
"""
395395
pre = (
396396
f", prereleases={self.prereleases!r}"
397397
if self._prereleases is not None
398398
else ""
399399
)
400400

401-
return f"<{self.__class__.__name__}({str(self)!r}{pre})>"
401+
return f"{self.__class__.__name__}({str(self)!r}{pre})"
402402

403403
def __str__(self) -> str:
404404
"""A string representation of the Specifier that can be round-tripped.
@@ -688,7 +688,7 @@ def filter(
688688
>>> list(Specifier(">=1.2.3").filter(["1.2", "1.3", "1.5a1"]))
689689
['1.3']
690690
>>> list(Specifier(">=1.2.3").filter(["1.2", "1.2.3", "1.3", Version("1.4")]))
691-
['1.2.3', '1.3', <Version('1.4')>]
691+
['1.2.3', '1.3', Version('1.4')]
692692
>>> list(Specifier(">=1.2.3").filter(["1.2", "1.5a1"]))
693693
['1.5a1']
694694
>>> list(Specifier(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True))
@@ -922,19 +922,19 @@ def __repr__(self) -> str:
922922
match the input string.
923923
924924
>>> SpecifierSet('>=1.0.0,!=2.0.0')
925-
<SpecifierSet('!=2.0.0,>=1.0.0')>
925+
SpecifierSet('!=2.0.0,>=1.0.0')
926926
>>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=False)
927-
<SpecifierSet('!=2.0.0,>=1.0.0', prereleases=False)>
927+
SpecifierSet('!=2.0.0,>=1.0.0', prereleases=False)
928928
>>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=True)
929-
<SpecifierSet('!=2.0.0,>=1.0.0', prereleases=True)>
929+
SpecifierSet('!=2.0.0,>=1.0.0', prereleases=True)
930930
"""
931931
pre = (
932932
f", prereleases={self.prereleases!r}"
933933
if self._prereleases is not None
934934
else ""
935935
)
936936

937-
return f"<{self.__class__.__name__}({str(self)!r}{pre})>"
937+
return f"{self.__class__.__name__}({str(self)!r}{pre})"
938938

939939
def __str__(self) -> str:
940940
"""A string representation of the specifier set that can be round-tripped.
@@ -958,9 +958,9 @@ def __and__(self, other: SpecifierSet | str) -> SpecifierSet:
958958
:param other: The other object to combine with.
959959
960960
>>> SpecifierSet(">=1.0.0,!=1.0.1") & '<=2.0.0,!=2.0.1'
961-
<SpecifierSet('!=1.0.1,!=2.0.1,<=2.0.0,>=1.0.0')>
961+
SpecifierSet('!=1.0.1,!=2.0.1,<=2.0.0,>=1.0.0')
962962
>>> SpecifierSet(">=1.0.0,!=1.0.1") & SpecifierSet('<=2.0.0,!=2.0.1')
963-
<SpecifierSet('!=1.0.1,!=2.0.1,<=2.0.0,>=1.0.0')>
963+
SpecifierSet('!=1.0.1,!=2.0.1,<=2.0.0,>=1.0.0')
964964
"""
965965
if isinstance(other, str):
966966
other = SpecifierSet(other)
@@ -1018,7 +1018,7 @@ def __iter__(self) -> Iterator[Specifier]:
10181018
in this specifier set.
10191019
10201020
>>> sorted(SpecifierSet(">=1.0.0,!=1.0.1"), key=str)
1021-
[<Specifier('!=1.0.1')>, <Specifier('>=1.0.0')>]
1021+
[Specifier('!=1.0.1'), Specifier('>=1.0.0')]
10221022
"""
10231023
return iter(self._specs)
10241024

@@ -1122,7 +1122,7 @@ def filter(
11221122
>>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", "1.5a1"]))
11231123
['1.3']
11241124
>>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", Version("1.4")]))
1125-
['1.3', <Version('1.4')>]
1125+
['1.3', Version('1.4')]
11261126
>>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.5a1"]))
11271127
['1.5a1']
11281128
>>> list(SpecifierSet(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True))

src/packaging/tags.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,10 @@ def __str__(self) -> str:
114114
return f"{self._interpreter}-{self._abi}-{self._platform}"
115115

116116
def __repr__(self) -> str:
117-
return f"<{self} @ {id(self)}>"
117+
return (
118+
f"{self.__class__.__name__}"
119+
f"({self._interpreter!r}, {self._abi!r}, {self._interpreter!r})"
120+
)
118121

119122
def __setstate__(self, state: tuple[None, dict[str, Any]]) -> None:
120123
# The cached _hash is wrong when unpickling.

0 commit comments

Comments
 (0)