Fix linting issues

Signed-off-by: Tushar Goel <[email protected]>

Author: TG1999

etc/scripts/generate_validators.py

@@ -72,8 +72,6 @@
 # Visit https://github.com/package-url/packageurl-python for support and
 # download.
 
-from packageurl.contrib.route import Router
-
 """
 Validate each type according to the PURL spec type definitions
 """

spec

@@ -133,7 +133,7 @@ def normalize_namespace(
         "hex",
     ):
         namespace_str = namespace_str.lower()
-    if ptype in ("cpan"):
+    if ptype and ptype in ("cpan"):
         namespace_str = namespace_str.upper()
     segments = [seg for seg in namespace_str.split("/") if seg.strip()]
     segments_quoted = map(get_quoter(encode), segments)
@@ -192,6 +192,8 @@ def normalize_name(
         name_str = name_str.lower()
     if ptype == "pypi":
         name_str = name_str.replace("_", "-").lower()
+    if ptype == "hackage":
+        name_str = name_str.replace("_", "-")
     return name_str or None
 
 
@@ -395,7 +397,7 @@ def __new__(
         version: AnyStr | None = None,
         qualifiers: AnyStr | dict[str, str] | None = None,
         subpath: AnyStr | None = None,
-        normalize_purl=True,
+        normalize_purl: bool = True,
     ) -> Self:
         required = dict(type=type, name=name)
         for key, value in required.items():
@@ -421,6 +423,13 @@ def __new__(
                 f"Invalid purl: qualifiers argument must be a dict or a string: {qualifiers!r}."
             )
 
+        type_final: str
+        namespace_final: Optional[str]
+        name_final: str
+        version_final: Optional[str]
+        qualifiers_final: dict[str, str]
+        subpath_final: Optional[str]
+
         if normalize_purl:
             (
                 type_final,
@@ -430,14 +439,18 @@ def __new__(
                 qualifiers_final,
                 subpath_final,
             ) = normalize(type, namespace, name, version, qualifiers, subpath, encode=None)
-
         else:
-            type_final = type
-            namespace_final = namespace
-            name_final = name
-            version_final = version
-            qualifiers_final = qualifiers
-            subpath_final = subpath
+            from packageurl.utils import ensure_str
+
+            type_final = ensure_str(type) or ""
+            namespace_final = ensure_str(namespace)
+            name_final = ensure_str(name) or ""
+            version_final = ensure_str(version)
+            if isinstance(qualifiers, dict):
+                qualifiers_final = qualifiers
+            else:
+                qualifiers_final = {}
+            subpath_final = ensure_str(subpath)
 
         return super().__new__(
             cls,

src/packageurl/__init__.py

@@ -24,6 +24,9 @@
 # Visit https://github.com/package-url/packageurl-python for support and
 # download.
 
+from typing import Optional
+from typing import Union
+
 from packageurl import PackageURL
 
 
@@ -51,3 +54,11 @@ def get_golang_purl(go_package: str):
     name = parts[-1]
     namespace = "/".join(parts[:-1])
     return PackageURL(type="golang", namespace=namespace, name=name, version=version)
+
+
+def ensure_str(value: Optional[Union[str, bytes]]) -> Optional[str]:
+    if value is None:
+        return None
+    if isinstance(value, bytes):
+        return value.decode("utf-8")  # or whatever encoding is right
+    return value

src/packageurl/utils.py

@@ -22,8 +22,6 @@
 # Visit https://github.com/package-url/packageurl-python for support and
 # download.
 
-from packageurl.contrib.route import Router
-
 """
 Validate each type according to the PURL spec type definitions
 """
@@ -41,7 +39,10 @@ def validate(cls, purl, strict=False):
         elif cls.namespace_requirement == "required" and not purl.namespace:
             yield f"Namespace is required for purl type: {cls.type!r}"
 
-        if (
+        if purl.type == "cpan":
+            if purl.namespace and purl.namespace != purl.namespace.upper():
+                yield f"Namespace must be uppercase for purl type: {cls.type!r}"
+        elif (
             not cls.namespace_case_sensitive
             and purl.namespace
             and purl.namespace.lower() != purl.namespace
@@ -243,6 +244,14 @@ class CpanTypeValidator(TypeValidator):
     version_case_sensitive = True
     purl_pattern = "pkg:cpan/.*"
 
+    @classmethod
+    def validate_type(cls, purl, strict=False):
+        if purl.namespace and "::" in purl.name:
+            yield f"Name must not contain '::' when Namespace is absent for purl type: {cls.type!r}"
+        if not purl.namespace and "-" in purl.name:
+            yield f"Name must not contain '-' when Namespace is absent for purl type: {cls.type!r}"
+        yield from super().validate_type(purl, strict)
+
 
 class CranTypeValidator(TypeValidator):
     type = "cran"
@@ -355,6 +364,12 @@ class HackageTypeValidator(TypeValidator):
     version_case_sensitive = True
     purl_pattern = "pkg:hackage/.*"
 
+    @classmethod
+    def validate_type(cls, purl, strict=False):
+        if "_" in purl.name:
+            yield f"Name contains underscores but should be kebab-case for purl type: {cls.type!r}"
+        yield from super().validate_type(purl, strict)
+
 
 class HexTypeValidator(TypeValidator):
     type = "hex"
@@ -481,6 +496,14 @@ class PubTypeValidator(TypeValidator):
     version_case_sensitive = True
     purl_pattern = "pkg:pub/.*"
 
+    @classmethod
+    def validate_type(cls, purl, strict=False):
+        if any(not (c.islower() or c.isdigit() or c == "_") for c in purl.name):
+            yield f"Name contains invalid characters but should only contain lowercase letters, digits, or underscores for purl type: {cls.type!r}"
+        if " " in purl.name:
+            yield f"Name contains spaces but should use underscores instead for purl type: {cls.type!r}"
+        yield from super().validate_type(purl, strict)
+
 
 class PypiTypeValidator(TypeValidator):
     type = "pypi"
@@ -495,6 +518,12 @@ class PypiTypeValidator(TypeValidator):
     version_case_sensitive = True
     purl_pattern = "pkg:pypi/.*"
 
+    @classmethod
+    def validate_type(cls, purl, strict=False):
+        if "_" in purl.name:
+            yield f"Name cannot contain `_` for purl type:{cls.type!r}"
+        yield from super().validate_type(purl, strict)
+
 
 class QpkgTypeValidator(TypeValidator):
     type = "qpkg"