Changeset 666465b in git for modules/openmathserver/objects.py

Timestamp:

Sep 25, 2005, 5:35:57 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

82d1a72c907e4d9593d13fb4216f23d0e65fad42

Parents:

35ad2d7b29d3ac4852f704804d704a4417c383eb

Message:

*bricken real xml encoder


git-svn-id: file:///usr/local/Singular/svn/trunk@8664 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• modules/openmathserver/objects.py (modified) (5 diffs)

modules/openmathserver/objects.py

@@ -4 +4 @@
 from exceptions import NotImplementedError
 from copy import copy
+from xml.sax.xmlreader import AttributesImpl as attr
 import base64
 #TODO: OMOBJ, OME, OMATTR
@@ -73 +74 @@
             raise UnsupportedOperationError
     def __getXMLAttributes(self):
-        try:
+        if hasattr(self, "getXMLAttributes"):
             return self.getXMLAttributes()
-        except AttributeError:
-            try:
-                return self.__XMLAttributes
-            except AttributeError:
+        if hasattr(self,"__XMLAttributes"):
+            return self.__XMLAttributes
+        return {}
+            #except AttributeError:
                 #do return None, cause if modifiying a new list, changes will not be saved
-                return []
+            #    return {}
     def __delXMLAttributes(self):
         try:
@@ -143 +144 @@
         encodingList.extend(["</"+self.XMLtag+">"])
         return encodingList
-
+    def XMLSAXEncode(self, context, generator):
+        #works not for attp
+        generator.startElement(self.XMLtag, attr(self.XMLAttributes))
+        for c in self.children:
+          c.XMLSAXEncode(context, generator)
+        if not self.children:
+          body=self.body
+          if body:
+            generator.characters(self.body)
+        generator.endElement(self.XMLtag)
 class OMObject(OMObjectBase):
     def __init__(self, children):
@@ -210 +220 @@
     XMLtag="OMS"
     def getXMLAttributes(self):
-        return [XMLAttribute("name", self.name),\
-                 XMLAttribute("cdbase", self.cd.base),\
-                 XMLAttribute("cd", self.cd.name)]
+        #return [XMLAttribute("name", self.name),\
+        #         XMLAttribute("cdbase", self.cd.base),\
+        #         XMLAttribute("cd", self.cd.name)]
+        return {"name":self.name, "cdbase":self.cd.base, "cd": self.cd.name}
     def setXMLAttributes(self):
         raise UnsupportedOperationError
@@ -257 +268 @@
     XMLtag = "OMF"
     def getXMLAttributes(self):
-        return [XMLAttribute("dec" ,str(self.value))]
+        return {"dec":str(self.value)}
 class OMString(SimpleValue):
     def __init__(self,value):