[Dev OpenGP] [36] always DomElementMethods...

[subversion@xxxxxxxxxxxxx]

Revision: 36
Author:   nicolaf
Date:     2009-03-14 22:10:13 +0100 (Sat, 14 Mar 2009)

Log Message:
-----------
always DomElementMethods...

Modified Paths:
--------------
    trunk/src/DomElementMethods/ElementMethods.py
    trunk/src/DomElementMethods/__init__.py


Modified: trunk/src/DomElementMethods/ElementMethods.py
===================================================================
--- trunk/src/DomElementMethods/ElementMethods.py	2009-03-14 21:04:00 UTC (rev 35)
+++ trunk/src/DomElementMethods/ElementMethods.py	2009-03-14 21:10:13 UTC (rev 36)
@@ -155,3 +155,6 @@
 			if br.nodeType == Node.ELEMENT_NODE and not br.isSameNode(self) and br.tagName == self.tagName and br.getAttributes() == newattrs:
 				raise InvalidAccessErr
 	self.__oldSetAttribute(name, value)
+
+def merge(childPeer):
+	pass

Modified: trunk/src/DomElementMethods/__init__.py
===================================================================
--- trunk/src/DomElementMethods/__init__.py	2009-03-14 21:04:00 UTC (rev 35)
+++ trunk/src/DomElementMethods/__init__.py	2009-03-14 21:10:13 UTC (rev 36)
@@ -25,3 +25,5 @@
 
 Element.__oldSetAttribute=Element.setAttribute
 Element.setAttribute=setAttribute
+
+Element.merge=merge