wip

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/validation/xml.py

@@ -49,7 +49,7 @@
 
 class XmlValidationError(ValidationError):
     @classmethod
-    def __make_from_xle(cls, e: '_XmlLogEntry') -> 'XmlValidationError':
+    def _make_from_xle(cls, e: '_XmlLogEntry') -> 'XmlValidationError':
         """⚠️ This is an internal API. It is not part of the public interface and may change without notice."""
         # in preparation for https://github.com/CycloneDX/cyclonedx-python-lib/pull/836
         return cls(e)

examples/complex_deserialize.py

@@ -147,9 +147,9 @@
 }"""
 my_json_validator = JsonStrictValidator(SchemaVersion.V1_6)
 try:
-    validation_errors = my_json_validator.validate_str(json_data)
-    if validation_errors:
-        print('JSON invalid', 'ValidationError:', repr(validation_errors), sep='\n', file=sys.stderr)
+    json_validation_errors = my_json_validator.validate_str(json_data)
+    if json_validation_errors:
+        print('JSON invalid', 'ValidationError:', repr(json_validation_errors), sep='\n', file=sys.stderr)
         sys.exit(2)
     print('JSON valid')
 except MissingOptionalDependencyException as error:
@@ -248,9 +248,9 @@
 </bom>"""
 my_xml_validator: 'XmlValidator' = make_schemabased_validator(OutputFormat.XML, SchemaVersion.V1_6)
 try:
-    validation_errors = my_xml_validator.validate_str(xml_data)
-    if validation_errors:
-        print('XML invalid', 'ValidationError:', repr(validation_errors), sep='\n', file=sys.stderr)
+    xml_validation_errors = my_xml_validator.validate_str(xml_data)
+    if xml_validation_errors:
+        print('XML invalid', 'ValidationError:', repr(xml_validation_errors), sep='\n', file=sys.stderr)
         sys.exit(2)
     print('XML valid')
 except MissingOptionalDependencyException as error:

examples/complex_serialize.py

@@ -91,9 +91,9 @@
 print(serialized_json)
 my_json_validator = JsonStrictValidator(SchemaVersion.V1_6)
 try:
-    validation_errors = my_json_validator.validate_str(serialized_json)
-    if validation_errors:
-        print('JSON invalid', 'ValidationError:', repr(validation_errors), sep='\n', file=sys.stderr)
+    json_validation_errors = my_json_validator.validate_str(serialized_json)
+    if json_validation_errors:
+        print('JSON invalid', 'ValidationError:', repr(json_validation_errors), sep='\n', file=sys.stderr)
         sys.exit(2)
     print('JSON valid')
 except MissingOptionalDependencyException as error:
@@ -112,9 +112,9 @@
 my_xml_validator: 'XmlValidator' = make_schemabased_validator(
     my_xml_outputter.output_format, my_xml_outputter.schema_version)
 try:
-    validation_errors = my_xml_validator.validate_str(serialized_xml)
-    if validation_errors:
-        print('XML invalid', 'ValidationError:', repr(validation_errors), sep='\n', file=sys.stderr)
+    xml_validation_errors = my_xml_validator.validate_str(serialized_xml)
+    if xml_validation_errors:
+        print('XML invalid', 'ValidationError:', repr(xml_validation_errors), sep='\n', file=sys.stderr)
         sys.exit(2)
     print('XML valid')
 except MissingOptionalDependencyException as error: