Skip to content
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

XML-in-XML improvements / edge-case coverage #50

Merged
merged 2 commits into from
Feb 24, 2025
Merged

XML-in-XML improvements / edge-case coverage #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5523653
fix: check for embedded 'xmlns:' in FileTypeXML (if <?xml> isn't at t…
fritz-astronomer Feb 21, 2025
f58e64f
fix: add unit test for embedded xml
fritz-astronomer Feb 21, 2025
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
14 changes: 13 additions & 1 deletion orbiter/file_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,18 @@ def xmltodict_parse(input_str: str) -> Any:
{'a': [{'@foo': 'bar', 'foo': [{'@bar': 'baz'}, {'@bing': 'bop'}]}]}
>>> xmltodict_parse("<a>&lt;?xml version=&apos;1.0&apos; encoding=&apos;UTF-16&apos;?&gt;&lt;Properties version=&apos;1.1&apos;&gt;&lt;/Properties&gt;</a>")
{'a': {'Properties': [{'@version': '1.1'}]}}
>>> xmltodict_parse('''<Source>&lt;Activity mc:Ignorable="sap sap2010 sads"
... x:Class="Activity" sap2010:WorkflowViewState.IdRef="Activity_1"
... xmlns="http://schemas.microsoft.com/netfx/2009/xaml/activities"
... xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"&gt;
... &lt;TextExpression.NamespacesForImplementation&gt;
... &lt;sco:Collection x:TypeArguments="x:String"&gt;
... &lt;x:String&gt;System&lt;/x:String&gt;
... &lt;/sco:Collection&gt;
... &lt;/TextExpression.NamespacesForImplementation&gt;
... &lt;/Activity&gt;</Source>
... ''') # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
{'Source': {'Activity': [{'@mc:Ignorable': 'sap sap2010 sads',... 'TextExpression.NamespacesForImplementation': [{'sco:Collection': [{...}]}]}]}}

```
:param input_str: The XML string to parse
Expand Down Expand Up @@ -134,7 +146,7 @@ def _fix(d):
_fix(v)
else:
_fix(v)
if isinstance(v, str) and (v.startswith("<?xml") or v.startswith("<?XML")):
if isinstance(v, str) and (any(v.startswith(i) for i in ("<?xml", "<?XML")) or ("xmlns:" in v)):
d[k] = _fix_escaped_xml(v)
# if it's a list, descend to fix
if isinstance(d, list):
Expand Down
Loading