[Python-modules-commits] r7015 - in packages/python-soappy/trunk/debian (3 files)

[bzed at users.alioth.debian.org]

    Date: Saturday, November 29, 2008 @ 19:06:00
  Author: bzed
Revision: 7015

debian/patches/fix_new_style_classes.dpatch:
fix SOAPBuilder to gracefully handle new style classes
(e.g. faultType in python 2.5). Closes: #507266

Added:
  packages/python-soappy/trunk/debian/patches/fix_new_style_classes.dpatch
Modified:
  packages/python-soappy/trunk/debian/changelog
  packages/python-soappy/trunk/debian/patches/00list

Modified: packages/python-soappy/trunk/debian/changelog
===================================================================
--- packages/python-soappy/trunk/debian/changelog	2008-11-29 17:44:15 UTC (rev 7014)
+++ packages/python-soappy/trunk/debian/changelog	2008-11-29 19:06:00 UTC (rev 7015)
@@ -1,4 +1,4 @@
-python-soappy (0.12.0-3) UNRELEASED; urgency=low
+python-soappy (0.12.0-3) unstable; urgency=low
 
   [ Serafeim Zanikolas ]
   * Add patch to remove obsolete imports of nested_scopes (Closes: #498928).
@@ -22,8 +22,13 @@
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Bernd Zeimetz <bzed at debian.org>  Sun, 02 Mar 2008 22:26:30 +0100
+  [Thomas Viehmann]
+  * debian/patches/fix_new_style_classes.dpatch:
+    fix SOAPBuilder to gracefully handle new style classes
+    (e.g. faultType in python 2.5). Closes: #507266
 
+ -- Bernd Zeimetz <bzed at debian.org>  Sat, 29 Nov 2008 20:06:30 +0100
+
 python-soappy (0.12.0-2) unstable; urgency=low
 
   * debian/control:

Modified: packages/python-soappy/trunk/debian/patches/00list
===================================================================
--- packages/python-soappy/trunk/debian/patches/00list	2008-11-29 17:44:15 UTC (rev 7014)
+++ packages/python-soappy/trunk/debian/patches/00list	2008-11-29 19:06:00 UTC (rev 7015)
@@ -1,4 +1,5 @@
 fpconst.dpatch
 future_compat.dpatch
 rm_bogus_shebang.dpatch
+fix_new_style_classes.dpatch
 rm_nested_scopes_import.dpatch

Added: packages/python-soappy/trunk/debian/patches/fix_new_style_classes.dpatch
===================================================================
--- packages/python-soappy/trunk/debian/patches/fix_new_style_classes.dpatch	                        (rev 0)
+++ packages/python-soappy/trunk/debian/patches/fix_new_style_classes.dpatch	2008-11-29 19:06:00 UTC (rev 7015)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_new_style_classes.dpatch by Thomas Viehmann <tv at beamnet.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix SOAPBuilder.py dump to gracefully handle new style classes
+## DP: such as faulType (new style in python2.5 as subclass of
+## DP: Exception)
+
+ at DPATCH@
+--- trunk~/SOAPpy/SOAPBuilder.py	2005-02-21 21:24:13.000000000 +0100
++++ trunk/SOAPpy/SOAPBuilder.py	2008-11-29 16:57:21.000000000 +0100
+@@ -281,12 +281,14 @@
+         if Config.debug: print "In dump.", "obj=", obj
+         ns_map = ns_map.copy()
+         self.depth += 1
+-
+         if type(tag) not in (NoneType, StringType, UnicodeType):
+             raise KeyError, "tag must be a string or None"
+-
++        if isinstance(obj, anyType):
++            methname = "dump_instance"
++        else:
++            methname = "dump_" + type(obj).__name__
+         try:
+-            meth = getattr(self, "dump_" + type(obj).__name__)
++            meth = getattr(self, methname)
+         except AttributeError:
+             if type(obj) == LongType:
+                 obj_type = "integer"
+@@ -392,7 +394,7 @@
+         tag = tag or self.gentag()
+         tag = toXMLname(tag) # convert from SOAP 1.2 XML name encoding
+ 
+-        if type(obj) == InstanceType:
++        if type(obj) == InstanceType or isinstance(obj, anyType):
+             data = obj.data
+         else:
+             data = obj


Property changes on: packages/python-soappy/trunk/debian/patches/fix_new_style_classes.dpatch
___________________________________________________________________
Name: svn:executable
   + *