Skip to content

Fix source_format when using a mix of xml/mediawiki sources #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VisLab merged 1 commit into from
Mar 27, 2024
Merged

Fix source_format when using a mix of xml/mediawiki sources #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hed/schema/schema_io/base2schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def _load(self):
if not self.appending_to_schema and self._schema.with_standard and not self._schema.merged:
from hed.schema.hed_schema_io import load_schema_version
saved_attr = self._schema.header_attributes
saved_format = self._schema.source_format
try:
base_version = load_schema_version(self._schema.with_standard)
except HedFileError as e:
Expand All @@ -115,6 +116,7 @@ def _load(self):
self._schema.filename = self.filename
self._schema.name = self.name # Manually set name here as we don't want to pass it to load_schema_version
self._schema.header_attributes = saved_attr
self._schema.source_format = saved_format
self._loading_merged = False

self._parse_data()
Expand Down
2 changes: 2 additions & 0 deletions tests/schema/test_schema_compare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ def test_compare_schemas(self):

def test_compare_and_summarize_schemas_test(self):
schema1 = load_schema(os.path.join(self.base_data, "schema_compare.mediawiki"), name="Schema1")
self.assertEqual(schema1.source_format, ".mediawiki")
schema2 = load_schema(os.path.join(self.base_data, "schema_compare2.mediawiki"), name="Schema2")
self.assertEqual(schema2.source_format, ".mediawiki")

result = gather_schema_changes(schema1, schema2)
self.assertEqual(sum(len(x) for x in result.values()), 30)
Expand Down