Merge lp:~osomon/ubuntu-themes/scavenge-preserve-namespaces into lp:ubuntu-themes

[Olivier Tilloy]

[lp:~osomon/ubuntu-themes/scavenge-preserve-namespaces]

633. By Olivier Tilloy on 2020-03-17

Fix for Python3 compatibility.

[Iain Lane (laney)]

Looks like this was uploaded but never merged.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2019-02-13 14:45:59 +0000
+++ debian/changelog	2020-03-17 15:44:00 +0000
@@ -1,3 +1,10 @@
+ubuntu-themes (19.04-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Preserve namespace declarations in the script that combines multiple
+    SVG files into one (LP: #1867766)
+
+ -- Olivier Tilloy <[e-mail]>  Tue, 17 Mar 2020 15:58:56 +0100
+
 ubuntu-themes (19.04-0ubuntu1) disco; urgency=medium
 
   [ Khurshid Alam ]

=== modified file 'scavenge.py'
--- scavenge.py	2012-12-11 09:58:35 +0000
+++ scavenge.py	2020-03-17 15:44:00 +0000
@@ -2,7 +2,8 @@
 # Copyright 2011 Canonical Ltd.  Distributed under the terms of the GNU GPLv3.
 # Combines multiple SVG files into a single SVG in batch mode
 # 2011-01-04 Mathieu Trudel-Lapierre <[e-mail]>
-# 2011-01-05 Paul Sladen <[e-mail]>
+# 2011-01-05 Paul Sladen <[e-mail]>
+# 2020-03-17 Olivier Tilloy <[e-mail]>
 
 import xml.dom.minidom
 import sys
@@ -31,6 +32,7 @@
 
     # Open first SVG and then composite others on top as overlays
     base = xml.dom.minidom.parse(args[0])
+    root = base.getElementsByTagName("svg")[0]
     newline = lambda: base.createTextNode('\n')
 
     for overlay in args[1:]:
@@ -39,7 +41,12 @@
 
         # Pull-in '<svg>' tag, clear attributes and rename to '<g>'
         g = base.importNode(dom.getElementsByTagName("svg")[0], deep = True)
-        [g.removeAttribute(k) for k in g.attributes.keys() if k != 'id']
+        for k in list(g.attributes.keys()):
+            if k.startswith('xmlns:'):
+                # Preserve namespace declarations (LP: #1867766)
+                root.setAttributeNS('', k, g.getAttribute(k))
+            if k != 'id':
+                g.removeAttribute(k)
         g.tagName = 'g'
 
         # Insert into first SVG with comments and spacing