Merge branch 'release/2.5' into hotfix/2.5.4

superdesk · Feb 17, 2023 · d0862b5 · d0862b5
2 parents 42d16cf + 9ba2b70
commit d0862b5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -10,7 +10,7 @@ jobs:
     - uses: actions/setup-python@v4
       with:
         python-version: '3.10'
-    - run: pip install black
+    - run: pip install black~=22.0
     - run: black --check .
 
   flake8:

diff --git a/superdesk/io/feeding_services/ap_media.py b/superdesk/io/feeding_services/ap_media.py
@@ -25,6 +25,8 @@
 
 logger = logging.getLogger(__name__)
 
+nitf_namespace = {"nitf": "http://iptc.org/std/NITF/2006-10-18/"}
+
 
 class APMediaFeedingService(HTTPFeedingServiceBase):
     """
@@ -181,6 +183,14 @@ def _update(self, provider, update):
                     logger.info("Get AP nitf : {}".format(nitf_ref))
                     r = self.api_get(nitf_ref, provider)
                     root_elt = etree.fromstring(r.content)
+
+                    # If the default namespace definition is the nitf namespace then remove it
+                    if root_elt.nsmap and root_elt.nsmap.get(None) == nitf_namespace["nitf"]:
+                        for elem in root_elt.getiterator():
+                            if elem.tag:
+                                elem.tag = elem.tag.replace("{" + nitf_namespace["nitf"] + "}", "")
+                        etree.cleanup_namespaces(root_elt)
+
                     nitf_item = nitf.NITFFeedParser().parse(root_elt)
                     complete_item["nitf"] = nitf_item
                 else:

diff --git a/tests/io/fixtures/ap_media_text_nitf.xml b/tests/io/fixtures/ap_media_text_nitf.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<nitf version="-//IPTC//DTD NITF 3.4//EN" change.date="October 18, 2006" change.time="19:30">
+<nitf xmlns="http://iptc.org/std/NITF/2006-10-18/" version="-//IPTC//DTD NITF 3.4//EN" change.date="October 18, 2006"
+      change.time="19:30">
     <head>
         <docdata>
             <doc-id regsrc="AP"/>