Changeset 559396 in git

Timestamp:

Jun 17, 2005, 11:29:27 AM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

88f1af180fd61cad5c84ed7e886b02fa905372c9

Parents:

d113d3aba56b6d8664654dbfaeeae4b356a2527e

Message:

*bricken: refactored


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

Location:

modules/openmathserver

Files:

• context.py (modified) (2 diffs)
• objects.py (modified) (3 diffs)
• xmlencodetest.py (modified) (1 diff)

modules/openmathserver/context.py

@@ -74 +74 @@
         #TODO: Make all objects __hash__ and __eq__
         if (len(obj.attributes)==0):
-            return obj.XMLencode(self)
+            return obj.XMLEncode(self)
         else:
             toencode=copy(obj)
@@ -81 +81 @@
             attribution=OMAttribution(*([OMAttributePair(k,obj.attributes[k])\
                 for k in obj.attributes])+[toencode])
-            return attribution.XMLencode(self)
+            return attribution.XMLEncode(self)
             
 class SimpleXMLEncoder(object):

modules/openmathserver/objects.py

@@ -88 +88 @@
     XMLAttributes=property(__getXMLAttributes,__setXMLAttributes,__delXMLAttributes,\
         "xml attributes")
-    def XMLencode(self, context):
+    def XMLEncode(self, context):
         
         attr=self.XMLAttributes
@@ -243 +243 @@
     def evaluate(self, context):
         return context.evaluate(self.ref)
-    def XMLencode(self, context):
+    def XMLEncode(self, context):
         "FIXME: maybe it should also be able to encode as reference"
         return context.XMLEncodeObject(self.ref)
@@ -310 +310 @@
     i=OMint(22482489)
     print i.body
-    print i.XMLencode(context)
+    print i.XMLEncode(context)
     #i.body="dshj"
    

modules/openmathserver/xmlencodetest.py

@@ -6 +6 @@
 i=OMint(22482489)
 #print i.body
-print i.XMLencode(context)
+print i.XMLEncode(context)
 print context.XMLEncodeObject(i)
 v=OMVar("x")
-print v.XMLencode(context)
+print v.XMLEncode(context)
 x=v
 y=OMVar("y")
 a=OMApply(OMSymbol("plus",arith1.content),[x,y,i])
-print a.XMLencode(context)
+print a.XMLEncode(context)
 print context.XMLEncodeObject(context.evaluate(a))
 a1=OMApply(OMSymbol("plus",arith1.content),[OMint(1),OMint(2)])