Mercurial > traipse_dev

diff orpg/mapper/base_msg.py @ 135:dcf4fbe09b70 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Beta 'OpenRPG' {091010-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 (Beta) Added Bookmarks Fix to Remote Admin Commands Minor fix to text based Server Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Added 'boot' command to remote admin Added confirmation window for sent nodes Minor changes to allow for portability to an OpenSUSE linux OS Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Zoom Mouse plugin added Images added to Plugin UI Switching to Element Tree Map efficiency, from FlexiRPG Added Status Bar to Update Manager default_manifest.xml renamed to default_upmana.xml Cleaner clode for saved repositories New TrueDebug Class in orpg_log (See documentation for usage) Mercurial's hgweb folder is ported to upmana **Pretty important update that can help remove thousands of dead children from your gametree. **Children, <forms />, <group_atts />, <horizontal />, <cols />, <rows />, <height />, etc... are all tags now. Check your gametree and look for dead children!! **New Gamtree Recusion method, mapping, and context sensitivity. !!Alpha - Watch out for infinite loops!!
author sirebral
date Tue, 10 Nov 2009 14:11:28 -0600
parents 072ffc1d466f
children e842a5f1b775
line wrap: on
line diff
--- a/orpg/mapper/base_msg.py	Fri Sep 25 20:47:16 2009 -0500
+++ b/orpg/mapper/base_msg.py	Tue Nov 10 14:11:28 2009 -0600
@@ -30,13 +30,15 @@
 from threading import RLock
 from orpg.networking.mplay_client import *
 
+from xml.etree.ElementTree import XML, fromstring, parse
+
 class map_element_msg_base:
 #  This is a base class
 
     def __init__(self,reentrant_lock_object = None):
 
-        if not hasattr(self,"tagname"):
-            raise Exception, "This is a virtual class that cannot be directly instantiated.  Set self.tagname in derived class."
+        if not self.tagname:
+            raise Exception, "This is a virtual class that cannot be directly instantiated.  Set self.tagname in derived class."; exit()
 
         self._props = {}
         #  This is a dictionary that holds (value,changed) 2-tuples, indexed by attribute
@@ -195,40 +197,38 @@
     #########################################
     #  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)
+    def init_from_xml(self, tree):
+        #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)
+    def set_from_xml(self, tree):
+        #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()
-
     # XML importers end
     #########################################