[magics] 06/07: Patch needed for xml2mv.py type error

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/2.33.0-1
in repository magics.

commit 72b7c0d9ebf45c2b0893be6e66f3629a73fca4a3
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 23 00:51:36 2017 +0100

    Patch needed for xml2mv.py type error
---
 debian/changelog                     |  1 +
 debian/patches/python-type-fix.patch | 21 +++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5582ba9..c8e6907 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 magics++ (2.33.0-1) unstable; urgency=medium
 
   * New upstream release
+  * Patch needed for xml2mv.py type error
   * Standards-Version: 4.0.0., no changes required
 
  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 20 Jun 2017 10:24:32 +0100
diff --git a/debian/patches/python-type-fix.patch b/debian/patches/python-type-fix.patch
new file mode 100644
index 0000000..8bf9999
--- /dev/null
+++ b/debian/patches/python-type-fix.patch
@@ -0,0 +1,21 @@
+Index: magics++-2.33.0/tools/xml2mv.py
+===================================================================
+--- magics++-2.33.0.orig/tools/xml2mv.py
++++ magics++-2.33.0/tools/xml2mv.py
+@@ -582,12 +582,12 @@ class ObjectHandler(ContentHandler):
+ 				else:
+ 					paramclass = self.classname
+ 				self.addParameterToClass(self.param, paramclass)
+-			type = attrs.get("to")
++			typ = attrs.get("to")
+ 			metview_type = attrs.get("metview_interface")
+ 			if metview_type != None:
+-				type = metview_type
+-			if (self.types.has_key(type)):
+-				f = self.types[type]
++				typ = metview_type
++			if (self.types.has_key(typ)):
++				f = self.types[typ]
+ 				self.newparam(self.param, f(self, attrs), self.default(attrs))
+ 			else:
+ 				self.last = self.last + self.options(attrs)
diff --git a/debian/patches/series b/debian/patches/series
index 1270541..200b05d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ unique-ptr.patch
 numpy-fixes.patch
 rm-ksh.patch
 fix-warnings.patch
+python-type-fix.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git