Mercurial > traipse_dev

diff orpg/mapper/base_msg.py @ 118:217fb049bd00 alpha

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Alpha 'OpenRPG' {091028-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: Adds Bookmarks (Alpha) with cool Smiley Star and Plus Symbol images! Changes made to the map for increased portability. SnowDog has changes planned in Core, though. Added an initial push to the BCG. Not much to see, just shows off how it is re-writing Main code. Fix to remote admin commands Minor fix to texted based server, works in /System/ folder Some Core changes to gametree to correctly disply Pretty Print, thanks David! Fix to Splitter Nodes not being created. Added images to Plugin Control panel for Autostart feature Fix to massive amounts of images loading; from Core fix to gsclient so with_statement imports Added 'boot' command to remote admin Prep work in Pass tool for remote admin rankings and different passwords, ei, Server, Admin, Moderator, etc. Remote Admin Commands more organized, more prep work. Added Confirmation window for sent nodes. Minor changes to allow for portability to an OpenSUSE linux OS (hopefully without breaking) {091028} 00: Made changes to gametree to start working with Element Tree, mostly from Core Minor changes to Map to start working with Element Tree, from Core Preliminary changes to map efficiency, from FlexiRPG Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Changes to main.py to start working with Element Tree
author sirebral
date Wed, 28 Oct 2009 14:24:54 -0500
parents 072ffc1d466f
children 36919b8a3ef9
line wrap: on
line diff
--- a/orpg/mapper/base_msg.py	Mon Oct 12 23:24:10 2009 -0500
+++ b/orpg/mapper/base_msg.py	Wed Oct 28 14:24:54 2009 -0500
@@ -30,6 +30,8 @@
 from threading import RLock
 from orpg.networking.mplay_client import *
 
+from xml.etree.ElementTree import XML
+
 class map_element_msg_base:
 #  This is a base class
 
@@ -195,40 +197,41 @@
     #########################################
     #  XML importers begin
 
-    def _from_dom(self,xml_dom,prop_func):
+    def _from_dom(self,xml,prop_func):
         self.p_lock.acquire()
-        if xml_dom.tagName == self.tagname:
-            if xml_dom.getAttributeKeys():
-                for k in xml_dom.getAttributeKeys():
-                    prop_func(k,xml_dom.getAttribute(k))
+        if xml.tag == self.tagname:
+            if xml.keys():
+                for k in xml.keys():
+                    prop_func(k,xml.get(k))
         else:
             self.p_lock.release()
             raise Exception, "Error attempting to modify a " + self.tagname + " from a non-<" + self.tagname + "/> element"
         self.p_lock.release()
 
-    def init_from_dom(self,xml_dom):
-    #  xml_dom must be pointing to an empty tag.  Override in a derived class for <map/> and other similar tags.
-        self._from_dom(xml_dom,self.init_prop)
+    def init_from_dom(self,xml):
+    #  xml must be pointing to an empty tag.  Override in a derived class for <map/> and other similar tags.
+        self._from_dom(xml,self.init_prop)
 
-    def set_from_dom(self,xml_dom):
-    #  xml_dom must be pointing to an empty tag.  Override in a derived class for <map/> and other similar tags
-        self._from_dom(xml_dom,self.set_prop)
+    def set_from_dom(self,xml):
+    #  xml must be pointing to an empty tag.  Override in a derived class for <map/> and other similar tags
+        self._from_dom(xml,self.set_prop)
 
-    def init_from_xml(self,xml):
-        xml_dom = parseXml(xml)
-        node_list = xml_dom.getElementsByTagName(self.tagname)
-        if len(node_list) < 1: print "Warning: no <" + self.tagname + "/> elements found in DOM."
+    def init_from_xml(self,xmlString):
+        tree = XML(xmlString)
+        node_list = tree.findall(self.tagname)
+        if len(node_list) < 1:
+            print "Warning: no <" + self.tagname + "/> elements found in DOM."
         else:
-            while len(node_list): self.init_from_dom(node_list.pop())
-        if xml_dom: xml_dom.unlink()
+            while len(node_list):
+                self.init_from_dom(node_list.pop())
 
-    def set_from_xml(self,xml):
-        xml_dom = parseXml(xml)
-        node_list = xml_dom.getElementsByTagName(self.tagname)
-        if len(node_list) < 1: print "Warning: no <" + self.tagname + "/> elements found in DOM."
+    def set_from_xml(self,xmlString):
+        tree = XML(xmlString)
+        node_list = tree.findall(self.tagname)
+        if len(node_list) < 1:
+            print "Warning: no <" + self.tagname + "/> elements found in DOM."
         else:
-            while len(node_list): self.set_from_dom(node_list.pop())
-        if xml_dom: xml_dom.unlink()
-
+            while len(node_list):
+                self.set_from_dom(node_list.pop())
     # XML importers end
     #########################################