Fix linting errors

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

Author: TG1999

src/packageurl/__init__.py

@@ -24,10 +24,13 @@
 
 from __future__ import annotations
 
+import dataclasses
 import re
 import string
 from collections import namedtuple
 from collections.abc import Mapping
+from dataclasses import dataclass
+from enum import Enum
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import Optional
@@ -58,6 +61,19 @@
 """
 
 
+class ValidationSeverity(str, Enum):
+    ERROR = "error"
+    WARNING = "warning"
+    INFO = "info"
+
+
+@dataclass
+class ValidationMessage:
+    severity: ValidationSeverity
+    message: str
+    to_dict = dataclasses.asdict
+
+
 def quote(s: AnyStr) -> str:
     """
     Return a percent-encoded unicode string, except for colon :, given an `s`
@@ -524,38 +540,38 @@ def to_string(self, encode: bool | None = True) -> str:
 
         return "".join(purl)
 
-    def validate(self, strict: bool = False) -> list:
+    def validate(self, strict: bool = False) -> list["ValidationMessage"]:
         """
         Validate this PackageURL object and return a list of validation error messages.
         """
         from packageurl.validate import DEFINITIONS_BY_TYPE
-        from packageurl.validate import ValidationMessage
-        from packageurl.validate import ValidationSeverity
 
         validator_class = DEFINITIONS_BY_TYPE.get(self.type)
         if not validator_class:
-            return [ValidationMessage(
-                severity=ValidationSeverity.ERROR,
-                message=f"Unexpected purl type: expected {self.type!r}",
-            )]
+            return [
+                ValidationMessage(
+                    severity=ValidationSeverity.ERROR,
+                    message=f"Unexpected purl type: expected {self.type!r}",
+                )
+            ]
         return list(validator_class.validate(purl=self, strict=strict))  # type: ignore[no-untyped-call]
-    
+
     @classmethod
-    def validate_string(cls, purl: str, strict: bool = False) -> list:
+    def validate_string(cls, purl: str, strict: bool = False) -> list["ValidationMessage"]:
         """
         Validate a PURL string and return a list of validation error messages.
         """
-        from packageurl.validate import ValidationMessage
-        from packageurl.validate import ValidationSeverity
-
         try:
-            purl = cls.from_string(purl, normalize_purl=not strict)
+            purl_obj = cls.from_string(purl, normalize_purl=not strict)
+            assert isinstance(purl_obj, PackageURL)
+            return purl_obj.validate(strict=strict)
         except ValueError as e:
-            return [ValidationMessage(
-                severity=ValidationSeverity.ERROR,
-                message=str(e),
-            )]
-        return purl.validate(strict=strict)
+            return [
+                ValidationMessage(
+                    severity=ValidationSeverity.ERROR,
+                    message=str(e),
+                )
+            ]
 
     @classmethod
     def from_string(cls, purl: str, normalize_purl: bool = True) -> Self:

src/packageurl/validate.py

@@ -26,27 +26,12 @@
 Validate each type according to the PURL spec type definitions
 """
 
-from enum import Enum
-from dataclasses import dataclass
-import dataclasses
-
-
-class ValidationSeverity(str, Enum):
-    ERROR = "error"
-    WARNING = "warning"
-    INFO = "info"
-
-
-@dataclass
-class ValidationMessage:
-    severity: ValidationSeverity
-    message: str
-    to_dict = dataclasses.asdict
 
 class BasePurlType:
     """
     Base class for all PURL type classes
     """
+
     type: str
     """The type string for this Package-URL type."""
 
@@ -86,13 +71,16 @@ def validate(cls, purl, strict=False):
         Validate a PackageURL instance or string.
         Yields ValidationMessage and performs strict validation if strict=True
         """
+        from packageurl import ValidationMessage
+        from packageurl import ValidationSeverity
+
         if not purl:
             yield ValidationMessage(
                 severity=ValidationSeverity.ERROR,
                 message="No purl provided",
             )
             return
-        
+
         from packageurl import PackageURL
 
         if not isinstance(purl, PackageURL):
@@ -103,11 +91,11 @@ def validate(cls, purl, strict=False):
                     severity=ValidationSeverity.ERROR,
                     message=f"Invalid purl {purl!r} string: {e}",
                 )
-                return        
+                return
 
         if not strict:
             purl = cls.normalize(purl)
-        
+
         yield from cls._validate_namespace(purl)
         yield from cls._validate_name(purl)
         yield from cls._validate_version(purl)
@@ -117,9 +105,12 @@ def validate(cls, purl, strict=False):
         messages = cls.validate_using_type_rules(purl, strict=strict)
         if messages:
             yield from messages
-    
+
     @classmethod
     def _validate_namespace(cls, purl):
+        from packageurl import ValidationMessage
+        from packageurl import ValidationSeverity
+
         if cls.namespace_requirement == "prohibited" and purl.namespace:
             yield ValidationMessage(
                 severity=ValidationSeverity.ERROR,
@@ -148,18 +139,24 @@ def _validate_namespace(cls, purl):
                 severity=ValidationSeverity.WARNING,
                 message=f"Namespace is not lowercased for purl type: {cls.type!r}",
             )
-    
+
     @classmethod
     def _validate_name(cls, purl):
         if not cls.name_case_sensitive and purl.name and purl.name.lower() != purl.name:
+            from packageurl import ValidationMessage
+            from packageurl import ValidationSeverity
+
             yield ValidationMessage(
                 severity=ValidationSeverity.WARNING,
                 message=f"Name is not lowercased for purl type: {cls.type!r}",
             )
-    
+
     @classmethod
     def _validate_version(cls, purl):
         if not cls.version_case_sensitive and purl.version and purl.version.lower() != purl.version:
+            from packageurl import ValidationMessage
+            from packageurl import ValidationSeverity
+
             yield ValidationMessage(
                 severity=ValidationSeverity.WARNING,
                 message=f"Version is not lowercased for purl type: {cls.type!r}",
@@ -211,6 +208,9 @@ def _validate_qualifiers(cls, purl):
         disallowed = purl_qualifiers_keys - allowed_qualifiers_set
 
         if disallowed:
+            from packageurl import ValidationMessage
+            from packageurl import ValidationSeverity
+
             yield ValidationMessage(
                 severity=ValidationSeverity.INFO,
                 message=(
@@ -361,6 +361,9 @@ class CpanTypeDefinition(BasePurlType):
 
     @classmethod
     def validate_using_type_rules(cls, purl, strict=False):
+        from packageurl import ValidationMessage
+        from packageurl import ValidationSeverity
+
         if purl.namespace and "::" in purl.name:
             yield ValidationMessage(
                 severity=ValidationSeverity.ERROR,
@@ -489,6 +492,9 @@ class HackageTypeDefinition(BasePurlType):
 
     @classmethod
     def validate_using_type_rules(cls, purl, strict=False):
+        from packageurl import ValidationMessage
+        from packageurl import ValidationSeverity
+
         if "_" in purl.name:
             yield ValidationMessage(
                 severity=ValidationSeverity.WARNING,
@@ -626,6 +632,9 @@ class PubTypeDefinition(BasePurlType):
 
     @classmethod
     def validate_using_type_rules(cls, purl, strict=False):
+        from packageurl import ValidationMessage
+        from packageurl import ValidationSeverity
+
         if not all(c.isalnum() or c == "_" for c in purl.name):
             yield ValidationMessage(
                 severity=ValidationSeverity.WARNING,
@@ -657,6 +666,9 @@ class PypiTypeDefinition(BasePurlType):
 
     @classmethod
     def validate_using_type_rules(cls, purl, strict=False):
+        from packageurl import ValidationMessage
+        from packageurl import ValidationSeverity
+
         if "_" in purl.name:
             yield ValidationMessage(
                 severity=ValidationSeverity.WARNING,

tests/test_purl_spec.py

@@ -25,9 +25,13 @@
 import json
 import os
 from dataclasses import dataclass
-from typing import Any, Dict, Optional, List
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
 
 import pytest
+
 from packageurl import PackageURL