Skip to content

Commit 361d730

Browse files
committed
rename: SourceDistributionFilename
Signed-off-by: Henry Schreiner <henryfs@princeton.edu>
1 parent 1a691ee commit 361d730

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

src/packaging/filenames.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"InvalidWheelFilename",
1919
"InvalidWheelFilename",
2020
"NormalizedName",
21-
"SourceFilename",
21+
"SourceDistributionFilename",
2222
"WheelFilename",
2323
"canonicalize_name",
2424
"canonicalize_version",
@@ -397,7 +397,7 @@ def from_filename(cls, filename: str, /, *, strict: bool) -> WheelFilename:
397397
return self
398398

399399

400-
class SourceFilename:
400+
class SourceDistributionFilename:
401401
"""Represents a source distribution filename and its parsed components.
402402
403403
Instances preserve the original name and version strings for round-tripping,
@@ -443,8 +443,8 @@ def to_filename(self) -> str:
443443
characters are replaced with ``_`` and characters are lower cased. The
444444
version is an instance of :class:`~packaging.version.Version`.
445445
446-
>>> from packaging.filenames import SourceFilename
447-
>>> SourceFilename("foo-bar", "1.0").to_filename()
446+
>>> from packaging.filenames import SourceDistributionFilename
447+
>>> SourceDistributionFilename("foo-bar", "1.0").to_filename()
448448
'foo_bar-1.0.tar.gz'
449449
450450
.. versionadded:: 26.1
@@ -464,7 +464,7 @@ def __str__(self) -> str:
464464
return self.to_filename()
465465

466466
@classmethod
467-
def from_filename(cls, filename: str, /, *, strict: bool) -> SourceFilename:
467+
def from_filename(cls, filename: str, /, *, strict: bool) -> SourceDistributionFilename:
468468
"""
469469
This function takes the filename of a sdist file (as specified
470470
in the `Source distribution format`_ documentation), and parses
@@ -476,8 +476,8 @@ def from_filename(cls, filename: str, /, *, strict: bool) -> SourceFilename:
476476
with an sdist extension (``.zip`` or ``.tar.gz``), or if it does not
477477
contain a dash separating the name and the version of the distribution.
478478
479-
>>> from packaging.filenames import SourceFilename
480-
>>> fn = SourceFilename.from_filename("foo-1.0.tar.gz", strict=True)
479+
>>> from packaging.filenames import SourceDistributionFilename
480+
>>> fn = SourceDistributionFilename.from_filename("foo-1.0.tar.gz", strict=True)
481481
>>> fn.name
482482
'foo'
483483
>>> fn.version

src/packaging/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
InvalidSdistFilename,
1313
InvalidWheelFilename,
1414
NormalizedName,
15-
SourceFilename,
15+
SourceDistributionFilename,
1616
WheelFilename,
1717
canonicalize_name,
1818
canonicalize_version,
@@ -105,5 +105,5 @@ def parse_sdist_filename(filename: str) -> tuple[NormalizedName, Version]:
105105
106106
.. _Source distribution format: https://packaging.python.org/specifications/source-distribution-format/#source-distribution-file-name
107107
"""
108-
fname = SourceFilename.from_filename(filename, strict=False)
108+
fname = SourceDistributionFilename.from_filename(filename, strict=False)
109109
return (fname.name, fname.version)

tests/test_filenames.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from packaging.filenames import (
88
InvalidFilename,
99
InvalidWheelFilename,
10-
SourceFilename,
10+
SourceDistributionFilename,
1111
WheelFilename,
1212
)
1313
from packaging.tags import Tag
@@ -45,7 +45,7 @@
4545
def test_sdist_not_strict_passes(
4646
name: str, version: str, expected_filename: str
4747
) -> None:
48-
fn = SourceFilename(name, version)
48+
fn = SourceDistributionFilename(name, version)
4949
assert str(fn) == expected_filename
5050
assert fn.original_name == name
5151
assert fn.original_version == version
@@ -94,7 +94,7 @@ def test_sdist_not_strict_passes(
9494
)
9595
def test_sdist_from_filename_invalid(filename: str, error_message: str) -> None:
9696
with pytest.raises(InvalidFilename) as e:
97-
SourceFilename.from_filename(filename, strict=True)
97+
SourceDistributionFilename.from_filename(filename, strict=True)
9898

9999
assert str(e.value) == f"{error_message}: {filename!r}"
100100

@@ -319,11 +319,11 @@ def test_parse_and_create_filename() -> None:
319319
],
320320
)
321321
def test_compose_sdist_filename(filename: str, name: str, version: Version) -> None:
322-
assert SourceFilename(name, str(version)).to_filename() == filename
322+
assert SourceDistributionFilename(name, str(version)).to_filename() == filename
323323

324324

325325
def test_sdist_from_filename_strict_valid() -> None:
326-
fn = SourceFilename.from_filename("foo_bar-1.0.tar.gz", strict=True)
326+
fn = SourceDistributionFilename.from_filename("foo_bar-1.0.tar.gz", strict=True)
327327
assert fn.name == "foo-bar"
328328
assert fn.version == Version("1.0")
329329

@@ -344,11 +344,11 @@ def test_wheel_repr() -> None:
344344

345345

346346
def test_sdist_version_property_invalid() -> None:
347-
fn = SourceFilename("foo", "not-a-version")
347+
fn = SourceDistributionFilename("foo", "not-a-version")
348348
with pytest.raises(InvalidFilename, match="invalid version"):
349349
_ = fn.version
350350

351351

352352
def test_sdist_repr() -> None:
353-
fn = SourceFilename("foo", "1.0")
354-
assert repr(fn) == "SourceFilename(name='foo', version='1.0')"
353+
fn = SourceDistributionFilename("foo", "1.0")
354+
assert repr(fn) == "SourceDistributionFilename(name='foo', version='1.0')"

0 commit comments

Comments
 (0)