Changeset 3781a2 in git

Timestamp:

Jun 24, 2005, 3:49:43 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

77f48383612238705c6d4aced9da57ed67fbb727

Parents:

936ad6e7b43877925b9627e6c3c2fed178961312

Message:

*bricken: beautified


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

Location:

modules/openmathserver

Files:

• cd.py (modified) (3 diffs)
• objects.py (modified) (7 diffs)

modules/openmathserver/cd.py

@@ -2 +2 @@
 from omexceptions import *
 class OMCD(object):
-    def __init__(self,name, base="http://www.openmath.org/cd"):
-        self.name=name
-        self.base=base
+    def __init__(self, name, base="http://www.openmath.org/cd"):
+        self.name = name
+        self.base = base
     def  __eq__(self, other):
         try:
-            return (self.name==other.name) and (self.base==other.base)
+            return (self.name == other.name) and (self.base == other.base)
         except:
             return False
@@ -15 +15 @@
 class OMCDImplementation(object):
     def __init__(self,cd):
-        self.cd=cd
-        self.implementations={}
+        self.cd = cd
+        self.implementations = {}
     def __getitem__(self, name):
         return self.implementations[name]
     def __setitem__(self,name,value):
-        self.implementations[name]=value
+        self.implementations[name] = value
     def implement(self,symbolname, func):
         symbol=OMSymbol(symbolname,self.cd)
-        impl=ImplementedOMSymbol(symbol,func)
+        impl = ImplementedOMSymbol(symbol,func)
         self[symbol]=impl
         
@@ -31 +31 @@
     def __init__(self,symbol, func):
         super(ImplementedOMSymbol,self).__init__(symbol.name, symbol.cd)
-        self.implementation=func
+        self.implementation = func
     def __str__(self):
         return "ImplementedOMS("+self.name+", " + self.cd.name +")"

modules/openmathserver/objects.py

@@ -1 @@
-from omexceptions import *
-from exceptions import *
+"""Implementation of openmath basic objects"""
+from omexceptions import UnsupportedOperationError 
+from  omexceptions import OutOfScopeError, EvaluationFailedError
+from exceptions import NotImplementedError
 from copy import copy
 import base64
@@ -194 +196 @@
 
 class OMint(SimpleValue):
-    def __init__(self,value):
-        if not isinstance(value,int):
+    def __init__(self, value):
+        if not isinstance(value, int):
             value = self.parse(value)
-        super(OMint,self).__init__(value)
-    def parse(self,value):
+        super(OMint, self).__init__(value)
+    def parse(self, value):
         """FIXME: Not fully standard compliant,
         -> hex encodings"""
-        return int(value,10)
+        return int(value, 10)
     def __str__(self):
         return "OMint("+repr(self.value)+")"
@@ -208 +210 @@
     def setBody(self, value):
         raise UnsupportedOperationError
-    XMLtag="OMI"
+    XMLtag = "OMI"
 class OMfloat(SimpleValue):
     def __init__(self, value):
@@ -220 +222 @@
     XMLtag = "OMF"
     def getXMLAttributes(self):
-        return [XMLAttribute("dec",str(self.value))]
+        return [XMLAttribute("dec" ,str(self.value))]
 class OMString(SimpleValue):
     def __init__(self,value):
@@ -230 +232 @@
         return self.value
 class OMByteArray(SimpleValue):
-    def __init__(self,value):
+    def __init__(self, value):
         super(OMByteArray,self).__init__(value)
     def __str__(self):
@@ -236 +238 @@
     def parse(self, value):
         return value
-    XMLtag="OMB"
+    XMLtag = "OMB"
     def getBody(self):
         return base64.encodestring(self.value)
@@ -276 +278 @@
     XMLtag = "OMATTR"
 if __name__ == '__main__':
-    from context import *
-
-    from binding import *
+    from context import Context
+
+    from binding import OMBinding, lambdasym
 
     context = Context()