[Scipy-svn] r3403 - trunk/scipy/io/nifti

[scipy-svn at scipy.org]

Author: jarrod.millman
Date: 2007-10-04 01:00:05 -0500 (Thu, 04 Oct 2007)
New Revision: 3403

Modified:
   trunk/scipy/io/nifti/niftiimage.py
Log:
remove decorators


Modified: trunk/scipy/io/nifti/niftiimage.py
===================================================================
--- trunk/scipy/io/nifti/niftiimage.py	2007-10-04 05:54:33 UTC (rev 3402)
+++ trunk/scipy/io/nifti/niftiimage.py	2007-10-04 06:00:05 UTC (rev 3403)
@@ -52,7 +52,6 @@
                             }
 
 
-    @staticmethod
     def numpydtype2niftidtype(array):
         """ Return the NIfTI datatype id for a corrsponding numpy array
         datatype.
@@ -64,9 +63,8 @@
             raise ValueError, "Unsupported datatype '%s'" % str(array.dtype)
 
         return NiftiImage.numpy2nifti_dtype_map[dtype]
+    numpydtype2niftidtype = staticmethod(numpydtype2niftidtype)
 
-
-    @staticmethod
     def splitFilename(filename):
         """ Split a NIfTI filename and returns a tuple of basename and
         extension. If no valid NIfTI filename extension is found, the whole
@@ -85,9 +83,8 @@
                 return filename, ''
             else:
                 return '.'.join(parts[:-1]), parts[-1]
+    splitFilename = staticmethod(splitFilename)
 
-
-    @staticmethod
     def nhdr2dict(nhdr):
         """ Convert a NIfTI header struct into a python dictionary.
 
@@ -138,9 +135,8 @@
         h['qoffset'] = [ nhdr.qoffset_x, nhdr.qoffset_y, nhdr.qoffset_z ]
 
         return h
+    nhdr2dict = staticmethod(nhdr2dict)
 
-
-    @staticmethod
     def updateNiftiHeaderFromDict(nhdr, hdrdict):
         """ Update a NIfTI header struct with data from a dictionary.
 
@@ -289,8 +285,8 @@
                 raise ValueError, \
                       "Nifti header property 'magic' must be 'ni1' or 'n+1'."
             nhdr.magic = hdrdict['magic']
+    updateNiftiHeaderFromDict = staticmethod(updateNiftiHeaderFromDict)
 
-
     def __init__(self, source, header = {}, load=False ):
         """ Create a Niftifile object.