[Erp5-report] r35521 nicolas - in /erp5/trunk/utils/erp5diff: ERP5Diff.py README

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri May 21 14:25:49 2010
New Revision: 35521

URL: http://svn.erp5.org?rev=35521&view=rev
Log:
* Add namespace declaration on xupdate nodes which are using
prefix in builded xpath expression.
* Update test according to this modification

Modified:
    erp5/trunk/utils/erp5diff/ERP5Diff.py
    erp5/trunk/utils/erp5diff/README

Modified: erp5/trunk/utils/erp5diff/ERP5Diff.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5diff/ERP5Diff.py?rev=35521&r1=35520&r2=35521&view=diff
==============================================================================
--- erp5/trunk/utils/erp5diff/ERP5Diff.py [utf8] (original)
+++ erp5/trunk/utils/erp5diff/ERP5Diff.py [utf8] Fri May 21 14:25:49 2010
@@ -214,7 +214,7 @@
     remove_element.attrib['select'] = path
     root.append(remove_element)
 
-  def _xupdateAppendElements(self, element_list, path, nsmap=None):
+  def _xupdateAppendElements(self, element_list, path):
     """
       Append elements to the element at 'path'.
       xupdate:append
@@ -234,18 +234,18 @@
         #reuse same container as preceding
         append_element = last_append_element
       elif relative_next is not None and relative_next not in element_list:
-        append_element = etree.SubElement(root, '{%s}insert-before' % self._ns, nsmap=nsmap)
+        append_element = etree.SubElement(root, '{%s}insert-before' % self._ns, nsmap=element.nsmap)
         path_list = self._makeRelativePathList([relative_next])
         next_sibling_path = self._concatPath(path, path_list[0])
         append_element.attrib['select'] = next_sibling_path
       elif relative_previous is not None and relative_previous not in element_list:
-        append_element = etree.SubElement(root, '{%s}insert-after' % self._ns, nsmap=nsmap)
+        append_element = etree.SubElement(root, '{%s}insert-after' % self._ns, nsmap=element.nsmap)
         path_list = self._makeRelativePathList([relative_previous])
         preceding_sibling_path = self._concatPath(path, path_list[0])
         append_element.attrib['select'] = preceding_sibling_path
       else:
         #xupdate:append by default
-        append_element = etree.SubElement(root, '{%s}append' % self._ns, nsmap=nsmap)
+        append_element = etree.SubElement(root, '{%s}append' % self._ns, nsmap=element.nsmap)
         if parent_element.index(element) == 0:
           child = 'first()'
         elif parent_element.index(element) == (len_total_child_list -1):

Modified: erp5/trunk/utils/erp5diff/README
URL: http://svn.erp5.org/erp5/trunk/utils/erp5diff/README?rev=35521&r1=35520&r2=35521&view=diff
==============================================================================
--- erp5/trunk/utils/erp5diff/README [utf8] (original)
+++ erp5/trunk/utils/erp5diff/README [utf8] Fri May 21 14:25:49 2010
@@ -724,14 +724,14 @@
   >>> erp5diff.output()
   <xupdate:modifications xmlns:xupdate="http://www.xmldb.org/xupdate" version="1.0">
     <xupdate:remove xmlns:prefixbis="http://any_uri_bis" select="/erp5/object[2]/prefixbis:title"/>
-    <xupdate:append select="/erp5/object[2]" child="first()">
+    <xupdate:append xmlns:prefix="http://any_uri" select="/erp5/object[2]" child="first()">
       <xupdate:element name="prefix:title" namespace="http://any_uri"><xupdate:attribute name="prefix:myattr" namespace="http://any_uri">anyvalue</xupdate:attribute>B</xupdate:element>
     </xupdate:append>
     <xupdate:remove xmlns:againanotherprefix="http://any_uri" select="/erp5/object[3]/againanotherprefix:title"/>
     <xupdate:append select="/erp5/object[3]" child="first()">
       <xupdate:element name="title">A</xupdate:element>
     </xupdate:append>
-    <xupdate:insert-after select="/erp5/object[3]">
+    <xupdate:insert-after xmlns:erp5="http://www.erp5.org/namespaces/erp5_object" select="/erp5/object[3]">
       <xupdate:element name="erp5:object" namespace="http://www.erp5.org/namespaces/erp5_object">
         <xupdate:attribute name="portal_type">Test</xupdate:attribute>
         <title>B</title>