and empty license expression is invalid

pypa · Sep 13, 2024 · e469b7e · e469b7e
1 parent cd7105f
commit e469b7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/packaging/licenses/__init__.py b/src/packaging/licenses/__init__.py
@@ -49,8 +49,11 @@ class InvalidLicenseExpression(ValueError):
 
 
 def normalize_license_expression(raw_license_expression: str) -> str | None:
- if not raw_license_expression:
- return None
+ if raw_license_expression == "":
+ message = (
+ f"Invalid license expression: {raw_license_expression}"
+ )
+ raise InvalidLicenseExpression(message)
 
  license_refs = {
  ref.lower(): "LicenseRef-" + ref[11:]

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
@@ -671,8 +671,6 @@ def test_optional_defaults_to_none(self, field_name):
  ("LicenseRef-Proprietary", "LicenseRef-Proprietary"),
  ("LicenseRef-Beerware-4.2", "LicenseRef-Beerware-4.2"),
  ("licenseref-beerware-4.2", "LicenseRef-beerware-4.2"),
- ("", None),
- (None, None),
  ],
  )
  def test_valid_license_expression(self, license_expression, expected):
@@ -684,6 +682,7 @@ def test_valid_license_expression(self, license_expression, expected):
  @pytest.mark.parametrize(
  "license_expression",
  [
+ "",
  "Use-it-after-midnight",
  "LicenseRef-License with spaces",
  "LicenseRef-License_with_underscores",