Attachment 161884 Details for Bug 247532 – signature.py patch to catch and report bad data

[patch] signature.py patch to catch and report bad data

tmp.patch (text/plain), 4.84 KB, created by John Dennis on 2007-08-20 14:44:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Dennis

Created: 2007-08-20 14:44:13 UTC

Size: 4.84 KB

patch

obsolete

>diff -r d8d705ca2ba7 src/signature.py
>--- a/src/signature.py	Mon Aug 13 15:54:49 2007 -0400
>+++ b/src/signature.py	Mon Aug 20 10:31:54 2007 -0400
>@@ -633,47 +633,51 @@ class XmlSerialize(object):
>             if value is not None:
>                 root.setProp(name, str(value))
>         for name in elements:
>-            name_info = self._xml_info[name]
>-            is_cdata = name_info.get('is_cdata', False)
>-            value = self.__dict__[name]
>-            if value is not None:
>-                if name_info.has_key('list'):
>-                    list_info = name_info['list']
>-                    item_name = list_info['name']
>-                    list = root.newChild(None, name, None)
>-                    if list_info.has_key('class'):
>-                        class_info = list_info['class']
>-                        class_name = class_info['name']
>-                        is_xml = class_info.get('is_xml', True)
>-                        if is_xml:
>-                            for item in value:
>-                                list.addChild(item.get_xml_nodes(doc, item_name))
>+            try:
>+                name_info = self._xml_info[name]
>+                is_cdata = name_info.get('is_cdata', False)
>+                value = self.__dict__[name]
>+                if value is not None:
>+                    if name_info.has_key('list'):
>+                        list_info = name_info['list']
>+                        item_name = list_info['name']
>+                        list = root.newChild(None, name, None)
>+                        if list_info.has_key('class'):
>+                            class_info = list_info['class']
>+                            class_name = class_info['name']
>+                            is_xml = class_info.get('is_xml', True)
>+                            if is_xml:
>+                                for item in value:
>+                                    list.addChild(item.get_xml_nodes(doc, item_name))
>+                            else:
>+                                for item in value:
>+                                    list.newChild(None, item_name, str(item))
>                         else:
>-                            for item in value:
>-                                list.newChild(None, item_name, str(item))
>+                            if is_cdata:
>+                                for item in value:
>+                                    new_node = list.newChild(None, item_name, None)
>+                                    new_node.addChild(doc.newCDataBlock(item, len(item)))
>+                            else:
>+                                for item in value:
>+                                    new_node = list.newChild(None, item_name, item)
>                     else:
>-                        if is_cdata:
>-                            for item in value:
>-                                new_node = list.newChild(None, item_name, None)
>-                                new_node.addChild(doc.newCDataBlock(item, len(item)))
>+                        if name_info.has_key('class'):
>+                            class_info = name_info['class']
>+                            class_name = class_info['name']
>+                            is_xml = class_info.get('is_xml', True)
>+                            if is_xml:
>+                                root.addChild(value.get_xml_nodes(doc, name))
>+                            else:
>+                                root.newChild(None, name, str(value))
>                         else:
>-                            for item in value:
>-                                new_node = list.newChild(None, item_name, item)
>-                else:
>-                    if name_info.has_key('class'):
>-                        class_info = name_info['class']
>-                        class_name = class_info['name']
>-                        is_xml = class_info.get('is_xml', True)
>-                        if is_xml:
>-                            root.addChild(value.get_xml_nodes(doc, name))
>-                        else:
>-                            root.newChild(None, name, str(value))
>-                    else:
>-                        if is_cdata:
>-                            new_node = root.newChild(None, name, None)
>-                            new_node.addChild(doc.newCDataBlock(value, len(value)))
>-                        else:
>-                            root.newChild(None, name, value)
>+                            if is_cdata:
>+                                new_node = root.newChild(None, name, None)
>+                                new_node.addChild(doc.newCDataBlock(value, len(value)))
>+                            else:
>+                                root.newChild(None, name, value)
>+            except Exception, e:
>+                log_xml.exception("%s.%s value=%s", self.__class__.__name__, name, value)
>+                
>         return root
> 
>     def init_from_xml_node(self, xml_node, scope='base', obj_name=None):

Actions: View | Diff

Attachments on bug 247532: 161884 | 161953 | 161994