Skip to content

Commit

Permalink
match formatting standards
Browse files Browse the repository at this point in the history
  • Loading branch information
ewdurbin committed Sep 13, 2024
1 parent 30e34f1 commit 8906b16
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/packaging/licenses/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def canonicalize_license_expression(
raw_license_expression: str,
) -> str | NormalizedLicenseExpression:
if raw_license_expression == "":
message = f"Invalid license expression: {raw_license_expression}"
message = f"Invalid license expression: {raw_license_expression!r}"
raise InvalidLicenseExpression(message)

license_refs = {
Expand Down Expand Up @@ -84,7 +84,7 @@ def canonicalize_license_expression(
elif token == "with":
python_tokens.append("or")
elif token == "(" and python_tokens and python_tokens[-1] not in {"or", "and"}:
message = f"Invalid license expression: {raw_license_expression}"
message = f"Invalid license expression: {raw_license_expression!r}"
raise InvalidLicenseExpression(message)
else:
python_tokens.append(token)
Expand All @@ -96,7 +96,7 @@ def canonicalize_license_expression(
result = True

if result is not False:
message = f"Invalid license expression: {raw_license_expression}"
message = f"Invalid license expression: {raw_license_expression!r}"
raise InvalidLicenseExpression(message) from None

# Take a final pass to check for unknown licenses/exceptions.
Expand All @@ -108,7 +108,7 @@ def canonicalize_license_expression(

if normalized_tokens and normalized_tokens[-1] == "WITH":
if token not in EXCEPTIONS:
message = f"Unknown license exception: {token}"
message = f"Unknown license exception: {token!r}"
raise InvalidLicenseExpression(message)

normalized_tokens.append(EXCEPTIONS[token]["id"])
Expand All @@ -122,12 +122,12 @@ def canonicalize_license_expression(

if final_token.startswith("licenseref-"):
if not license_ref_allowed.match(final_token):
message = f"Invalid licenseref: {final_token}"
message = f"Invalid licenseref: {final_token!r}"
raise InvalidLicenseExpression(message)
normalized_tokens.append(license_refs[final_token] + suffix)
else:
if final_token not in LICENSES:
message = f"Unknown license: {final_token}"
message = f"Unknown license: {final_token!r}"
raise InvalidLicenseExpression(message)
normalized_tokens.append(LICENSES[final_token]["id"] + suffix)

Expand Down

0 comments on commit 8906b16

Please sign in to comment.