Changeset 999

Timestamp:

13/06/08 11:44:48 (4 years ago)

Author:

Mark Koennecke

Message:

Made python binding compatible with python 2.4.3, refs #101

Location:

trunk/bindings/python

Files:

• nxs.py (modified) (10 diffs)
• nxstest.py (modified) (1 diff)

trunk/bindings/python/nxs.py

@@ -259 +259 @@
         status = self.lib.nxiopen_(filename,mode,_ref(self.handle))
         if status == ERROR:
-            op = 'open' if mode in [ACC_READ, ACC_RDWR] else 'create'
+            if mode in [ACC_READ, ACC_RDWR]:
+              op = 'open'
+            else:
+              op = 'create'
             raise RuntimeError, "Could not %s %s"%(op,filename)
         self.isopen = True
@@ -282 +285 @@
         """
         if self.isopen: return
-        mode = ACC_READ if self.mode==ACC_READ else ACC_RDWR
+        if self.mode==ACC_READ:
+            mode = ACC_READ
+        else:
+            mode = ACC_RDWR
         status = self.lib.nxiopen_(self.filename,mode,_ref(self.handle))
         if status == ERROR:
@@ -367 +373 @@
             raise ValueError, "Could not open %s in %s"%(path,self._loc())
         n,path,nxclass = self.getgroupinfo()
-        self.path = path.split('/') if path != 'root' else []
+        if path != 'root':
+            self.path = path.split('/')
+        else:
+            self.path = []
         
         
@@ -386 +395 @@
             raise ValueError, "Could not open %s in %s"%(path,self.filename)
         n,path,nxclass = self.getgroupinfo()
-        self.path = path.split('/') if path != 'root' else []
+        if path != 'root':
+            self.path = path.split('/')
+        else:
+            self.path = []
         
         
@@ -505 +517 @@
         n,path,_ = self.getgroupinfo()
         #print "path",path
-        path = "/"+path if not path == "root" else "/"
+        if not path == "root":
+            path = "/"+path
+        else:
+            path = "/"
         self.initgroupdir()
         L = []
@@ -1013 +1028 @@
                 target = self.getattr(name,length,dtype)
                 #print "target %s, path %s"%(target,pathstr)
-                return target if target != pathstr else None
+                if target != pathstr:
+                    return target
+                else:
+                    return None
         return None
 
@@ -1066 +1084 @@
         status = self.lib.nxiisexternalgroup_(self.handle,name,nxclass,
                                               url,maxnamelen)
-        return None if status == ERROR else url.value
+        if status == ERROR:
+            return None
+        else:
+            url.value
 
 
@@ -1076 +1097 @@
         This is an extension to the NeXus API.
         """
-        pathstr = "/".join(self.path) if not self.path == [] else "root"
+        if not self.path == []:
+            pathstr = "/".join(self.path)
+        else:
+            pathstr = "root"
         return "%s(%s)"%(self.filename,pathstr)
     
@@ -1105 +1129 @@
             size = data.nbytes
         return datafn,pdata,size
+
+    def _nxany(self,iter):
+        """
+        replace python 2.5 any()
+        """
+        for e in iter:
+            if e:
+                return 1
+            return 0
     
     def _pinput(self, data, dtype, shape):
@@ -1127 +1160 @@
             input_shape = numpy.array([i for i in data.shape if i != 1])
             target_shape = numpy.array([i for i in shape if i != 1])
-            if len(input_shape) != len(target_shape) or any(input_shape != target_shape):
+            print input_shape
+            print target_shape
+#            if len(input_shape) != len(target_shape) or any(input_shape != target_shape):
+            if len(input_shape) != len(target_shape) or self._nxany(input_shape != target_shape):
                 raise ValueError,\
                     "Shape mismatch %s!=%s: %s"%(data.shape,shape,self.filename)

trunk/bindings/python/nxstest.py

@@ -353 +353 @@
 def test():
     tests = 0
-    quiet = True if '-q' in sys.argv else False
-    external = True if '-x' in sys.argv else False
+    if '-q' in sys.argv:
+        quiet = True
+    else:
+        quiet = False
+    if '-x' in sys.argv:
+        external = True
+        
+    else:
+        external = False
     if 'hdf4' in sys.argv: 
         test_mode('w4',quiet,external)