* fix: make some get and add functions work, passes testAdd in xmlext tests

* bear with the fluctuation :)

pisi/xml/autoxml.py

@@ -25,14 +25,14 @@
 """
 
 # System
-import xml.dom.minidom as mdom
-from xml.parsers.expat import ExpatError
 import locale
 import codecs
 import types
 import formatter
 import sys
 from StringIO import StringIO
+#import xml.dom.minidom as mdom
+#from xml.parsers.expat import ExpatError
 
 import gettext
 __trans = gettext.translation('pisi', fallback=True)

pisi/xml/xmlext.py

@@ -12,8 +12,8 @@
 # Authors:  Eray Ozkural <eray@uludag.org.tr>
 
 try:
-    #from xmlextpiks import *
+    #zimbabwe # comment out to disable piks
-    zimbabwe
+    from xmlextpiks import *
 except:
     print 'xmlext: piksemel implementation cannot be loaded, falling back to minidom'
     from xmlextmdom import *

pisi/xml/xmlextmdom.py

@@ -195,4 +195,4 @@ def addNode(node, tagpath, newnode = None, branch=True):
 
 def addText(node, tagPath, text, branch = True):
     newnode = newTextNode(node, text)
-    addNode(node, tagPath, newnode, branch)
+    return addNode(node, tagPath, newnode, branch = branch)

pisi/xml/xmlextpiks.py

@@ -39,10 +39,10 @@ def getNodeAttribute(node, attrname):
 
 def getChildElts(node):
     """get only child elements"""
-    return [x for x in parent.childNodes if x.type == TAG ]
+    return [x for x in parent.childNodes if x.type() == TAG ]
 
 def getTagByName(parent, childName):
-    return [x for x in parent if x.type == TAG and x.name == childName]
+    return [x for x in parent if x.type() == TAG and x.name() == childName]
 
 def getNodeText(node, tagpath = ""):
     """get the first child and expect it to be text!"""
@@ -110,7 +110,7 @@ def createTagPath(node, tags):
     if len(tags)==0:
         return node
     for tag in tags:
-        node = node.appendTag(Node(tag))
+        node = node.appendTag(tag)
     return node
 
 def addTagPath(node, tags, newnode=None):
@@ -163,6 +163,7 @@ def addNode(node, tagpath, newnode = None, branch=True):
 #def newTextNode(node, text):
 #    return Node(text)
 
+
 def addText(node, tagPath, text, branch = True):
-    newnode = newTextNode(node, text)
+    node = addNode(node, tagPath, branch = branch)
-    addNode(node, tagPath, newnode, branch)
+    return node.appendData(text)

pisi/xml/xmlfile.py

@@ -12,9 +12,9 @@
 # Authors:  Eray Ozkural <eray@uludag.org.tr>
 
 try:
-    #from xmlextpiks import *
+    #horagata # comment out to disable piks
-    #from xmlfilepiks import *
+    from xmlextpiks import *
-    horagata
+    from xmlfilepiks import *
 except:
     print 'xmlfile: piksemel implementation cannot be loaded, falling back to minidom'
     from xmlfilemdom import *

tests/xmlexttests.py

@@ -34,7 +34,7 @@ class XmlExtTestCase(testcase.TestCase):
         self.assertEqual(xmlext.getNodeText(codeswith[2]), 'Caglar')
         
     def testAdd(self):
-        node = xmlext.newDocument('team')
+        node = xmlext.newDocument('pardus')
         #node = a.documentElement
         xmlext.addText(node, 'team/coder', 'zibidi1')
         xmlext.addText(node, 'team/coder', 'zibidi2')