Changeset 1571 for trunk/bindings/python/nxs

Timestamp:

21/10/10 16:35:38 (19 months ago)

Author:

Peter Chang

Message:

Refs #255, python tidy up

• Correct bugs in napi that were noted and fixed by NeXpy
• Fix an indentation mix up
• Rename unused variables to dummy (to pass pylint/pydev)
• Remove tree's unused imports
• Remove tree's _readattrs method as it is same as napi's getattrs

Location:

trunk/bindings/python/nxs

Files:

• napi.py (modified) (12 diffs)
• tree.py (modified) (10 diffs)

trunk/bindings/python/nxs/napi.py

@@ -256 +256 @@
         except:
             raise OSError, \
-                "NeXus library %s could not be loaded: %s"%(file,sys.exc_info()[0])
+                "NeXus library %s could not be loaded: %s"%(file,sys.exc_info())
     raise OSError, "Set NEXUSLIB or move NeXus to one of: %s"%(", ".join(files))
 
@@ -505 +505 @@
                 #print "target and current differ at",name
                 up = self._path[i:]
-                down = target[i:]
+                down = target[i:]
                 break
         else:
@@ -725 +725 @@
         n,_,_ = self.getgroupinfo()
         L = []
-        for i in range(n):
+        for dummy in range(n):
             name,nxclass = self.getnextentry()
             if nxclass not in H4SKIP:
@@ -925 +925 @@
         # TODO: consider accepting preallocated data so we don't thrash memory
         shape,dtype = self.getinfo()
-        data,pdata,size,datafn = self._poutput(dtype,shape)
+        dummy_data,pdata,dummy_size,datafn = self._poutput(dtype,shape)
         status = nxlib.nxigetdata_(self.handle,pdata)
         if status == ERROR:
@@ -946 +946 @@
         """
         # TODO: consider accepting preallocated data so we don't thrash memory
-        shape,dtype = self.getrawinfo()
-        data,pdata,size,datafn = self._poutput(dtype,slab_shape)
+        dummy_shape,dtype = self.getrawinfo()
+        dummy_data,pdata,dummy_size,datafn = self._poutput(dtype,slab_shape)
         slab_offset = numpy.array(slab_offset,'i')
         slab_shape = numpy.array(slab_shape,'i')
@@ -988 +988 @@
         Corresponds to NXputslab(handle,data,offset,shape)
         """
-        shape,dtype = self.getrawinfo()
+        dummy_shape,dtype = self.getrawinfo()
         data,pdata = self._pinput(data,dtype,slab_shape)
         slab_offset = numpy.array(slab_offset,'i')
@@ -1080 +1080 @@
         """
         if dtype is 'char': length += 1  # HDF4 needs zero-terminator
-        data,pdata,size,datafn = self._poutput(str(dtype),[length])
+        dummy_data,pdata,size,datafn = self._poutput(str(dtype),[length])
         storage = c_int(_nxtype_code[str(dtype)])
         #print "getattr",self._loc(),name,length,size,dtype
@@ -1166 +1166 @@
         self.initattrdir()
         n = self.getattrinfo()
-        for i in range(n):
+        for dummy in range(n):
             name,length,dtype = self.getnextattr()
             value = self.getattr(name,length,dtype)
@@ -1277 +1277 @@
         n = self.getattrinfo()
         self.initattrdir()
-        for i in range(n):
+        for dummy in range(n):
             name,length,dtype = self.getnextattr()
             if name == "target":
@@ -1365 +1365 @@
         on the data type and shape of the data group.
         """
+        if isinstance(shape, int):
+            shape = [shape]
         if len(shape) == 1 and dtype == 'char':
             # string - use ctypes allocator
@@ -1395 +1397 @@
         as you need pdata to keep the memory from being released to the heap.
         """
+        if isinstance(shape, int):
+            shape = [shape]
         if dtype == "char":
             data = numpy.asarray(data, dtype='S%d'%(shape[-1]))
@@ -1409 +1413 @@
                     or (input_shape != target_shape).any():
                 raise ValueError,\
-                    "Shape mismatch %s!=%s: %s"%(data_shape,shape,self._loc())
+                    "Shape mismatch %s!=%s: %s"%(data.shape,shape,self._loc())
             # Check data type
             if str(data.dtype) != dtype:

trunk/bindings/python/nxs/tree.py

@@ -130 +130 @@
 
 
-from copy import copy, deepcopy
-
-import os, numpy as np
+from copy import copy
+
+import numpy as np
 import napi
 import unit
@@ -220 +220 @@
             return None
 
-    def _readattrs(self):
-        """
-        Return the attributes for the currently open group/data or for
-        the file if no group or data object is open.
-        """
-        attrs = dict()
-        for i in range(self.getattrinfo()):
-            name,length,nxtype = self.getnextattr()
-            value = self.getattr(name, length, nxtype)
-            pair = self.NXattr(value,nxtype)
-            attrs[name] = pair
-            #print "read attr",name,pair.nxdata, pair.nxtype
-        return attrs
-
     def _readdata(self, name):
         """
@@ -242 +228 @@
         # Instead record the location, type and size
         self.opendata(name)
-        attrs = self._readattrs()
+        attrs = self.getattrs()
         if 'target' in attrs and attrs['target'].nxdata != self.path:
             # This is a linked dataset; don't try to load it.
@@ -268 +254 @@
     def _readchildren(self,n):
         children = {}
-        for i in range(n):
+        for dummy in range(n):
             name,nxclass = self.getnextentry()
             #print "name,class,path",name,nxclass,self.path
@@ -294 +280 @@
         # in and skip those of different classes?
         n,name,nxclass = self.getgroupinfo()
-        attrs = self._readattrs()
+        attrs = self.getattrs()
         if 'target' in attrs and attrs['target'].nxdata != self.path:
             # This is a linked group; don't try to load it.
@@ -654 +640 @@
 
     def _str_attrs(self,indent=0):
-        result = ""
         attrs = self.nxattrs
         names = attrs.keys()
@@ -1241 +1226 @@
     
     def nxdata_set(self, value):
-        nxtype, nxdims = _gettype(value)
+        dummy_nxtype, nxdims = _gettype(value)
         if nxdims == self.nxdims:
             self._value = _settype(value, self.nxtype)
@@ -1309 +1294 @@
             else:
                 slab = [slice(None), slice(None)]
-                for dim in signal.nxdims[2:]:
+                for dummy in signal.nxdims[2:]:
                     slab.append(0)
                 data = signal[slab].nxreshape(signal.nxdims[:2]).nxdata
@@ -1661 +1646 @@
         Find all child nodes that have a particular class.
         """
-        return [E for name,E in self.nxentries.items() if E.nxclass==nxclass]
+        return [E for dummy_name,E in self.nxentries.items() if E.nxclass==nxclass]
 
     def nxsignals(self):
@@ -2626 +2611 @@
 def imshow_irregular(x,y,z):
     import pylab
-    from matplotlib.ticker import FormatStrFormatter
+    #from matplotlib.ticker import FormatStrFormatter
     ax = pylab.gca()
     im = pylab.mpl.image.NonUniformImage(ax, extent=(x[0],x[-1],y[0],y[-1]), origin=None)