fix Windows CI tests

Author: medley56

.devcontainer/devcontainer.json

@@ -34,6 +34,7 @@
         "python.terminal.activateEnvironment": false,
         "python-envs.terminal.autoActivationType": "off",
         "python.defaultInterpreterPath": "python",
+        "python.REPL.enableREPLSmartSend": false,
         "python.testing.pytestEnabled": true,
         "python.testing.unittestEnabled": false,
         "python.testing.pytestArgs": [

.gitignore

@@ -60,6 +60,7 @@ Thumbs.db
 .idea
 .project
 .run
+.vscode
 
 # Virtual environment #
 #######################

space_packet_parser/xtce/validation.py

@@ -103,27 +103,42 @@ def __init__(self, message: str, validation_result: Optional[ValidationResult] =
         self.validation_result = validation_result
 
 
-def _fix_known_schema_issues(schema_content: str) -> str:
+def _fix_known_schema_issues(schema_content: bytes) -> bytes:
     """Fix known issues in the official XTCE XSD schema.
 
     The official OMG XTCE schema references xml:base but doesn't declare
     the xml namespace, causing lxml validation to fail.
+
+    Parameters
+    ----------
+    schema_content : bytes
+        The schema content as bytes
+
+    Returns
+    -------
+    bytes
+        The fixed schema content as bytes
     """
-    if 'ref="xml:base"' in schema_content:
+    # Decode to string for regex processing
+    content_str = schema_content.decode("utf-8")
+
+    if 'ref="xml:base"' in content_str:
         import re
 
         # Remove the problematic reference entirely since it's optional for validation
-        schema_content = re.sub(
+        content_str = re.sub(
             r'\s*<attribute\s+ref="xml:base"\s*/>\s*',
             "\n\t\t\t\t<!-- xml:base attribute removed for lxml compatibility -->\n\t\t\t\t",
-            schema_content,
+            content_str,
         )
-        schema_content = re.sub(
+        content_str = re.sub(
             r'\s*<attribute\s+ref="xml:base"></attribute>\s*',
             "\n\t\t\t\t<!-- xml:base attribute removed for lxml compatibility -->\n\t\t\t\t",
-            schema_content,
+            content_str,
         )
-    return schema_content
+
+    # Return as bytes
+    return content_str.encode("utf-8")
 
 
 def _load_schema(schema_location: Union[str, Path], timeout: int = 30) -> tuple[ElementTree.XMLSchema, str]:
@@ -151,7 +166,6 @@ def _is_http_url(s):
         result = urlparse(s)
         return result if all([result.scheme in ("http", "https"), result.netloc]) else False
 
-    schema_content = None
     parser = ElementTree.XMLParser(recover=True)
 
     # If the location is a string that parses as a URL
@@ -164,8 +178,8 @@ def _is_http_url(s):
             raise XtceValidationError(f"Failed to download schema from {schema_location}: {e}") from e
     # Otherwise assume a local filepath
     else:
-        with Path(schema_location).open("r") as sfh:
-            schema_content = sfh.read().encode("utf-8")
+        with Path(schema_location).open("rb") as sfh:
+            schema_content = sfh.read()
 
     # Fix and parse the schema content
     try:
@@ -174,12 +188,11 @@ def _is_http_url(s):
             return ElementTree.XMLSchema(schema_root_element), schema_root_element.get("version", "unknown")
         except ElementTree.XMLSchemaError as e:
             # Try to fix known issues
-            content_str = schema_content.decode("utf-8") if isinstance(schema_content, bytes) else schema_content
-            fixed_content = _fix_known_schema_issues(content_str)
+            fixed_content = _fix_known_schema_issues(schema_content)
 
-            if fixed_content != content_str:
+            if fixed_content != schema_content:
                 try:
-                    schema_root_element = ElementTree.XML(fixed_content.encode("utf-8"), parser)
+                    schema_root_element = ElementTree.XML(fixed_content, parser)
                     return ElementTree.XMLSchema(schema_root_element), schema_root_element.get("version", "unknown")
                 except ElementTree.XMLSchemaError:
                     pass  # Fall through to raise original error