Python 2.5 compatibility fix for mlab.py

efiring · efiring · commit 131f9dd58857 · 2007-06-12T01:39:16.000Z
svn path=/trunk/matplotlib/; revision=3386
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2007-06-11 Python 2.5 compatibility fix for mlab.py - EF
+
 2007-06-10 In matplotlibrc file, use 'dashed' | 'solid' instead
            of a pair of floats for contour.negative_linestyle - EF
 
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -172,7 +172,7 @@ def to_filehandle(fname):
         fh = fname
     else:
         raise ValueError('fname must be a string or file handle')
-    return fh 
+    return fh
 
 def flatten(seq, scalarp=is_scalar):
     """
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -76,7 +76,12 @@
 from numerix.mlab import hanning, cov, diff, svd, rand, std
 from numerix.fft import fft, inverse_fft
 
-from cbook import iterable, is_string_like, to_filehandle, set
+from cbook import iterable, is_string_like, to_filehandle
+
+try: set
+except NameError:
+    from sets import Set as set
+
 
 
 def mean(x, dim=None):
@@ -1280,7 +1285,7 @@ def save(fname, X, fmt='%.18e',delimiter=' '):
         X.shape = origShape
 
 
- 
+
 
 def load(fname,comments='#',delimiter=None, converters=None,skiprows=0,
          usecols=None, unpack=False):
@@ -1364,7 +1369,7 @@ def csv2rec(fname, comments='#', skiprows=0, checkrows=5, delimiter=','):
     numpy recarray.
 
     The data must be regular, same number of values in every row
-    
+
     A header row is required to automatically assign the recarray
     names.  The headers will be lower cased, spaces will be converted
     to underscores, and illegal attribute name characters removed.
@@ -1376,7 +1381,7 @@ def csv2rec(fname, comments='#', skiprows=0, checkrows=5, delimiter=','):
     in the file
 
     skiprows  - is the number of rows from the top to skip
-    
+
     checkrows - is the number of rows to check to validate the column
     data type.  When set to zero all rows are validated.
 
@@ -1386,8 +1391,8 @@ def csv2rec(fname, comments='#', skiprows=0, checkrows=5, delimiter=','):
     import numpy
     import dateutil.parser
     parsedate = dateutil.parser.parse
-    
-    
+
+
     fh = to_filehandle(fname)
     reader = csv.reader(fh, delimiter=delimiter)
 
@@ -1410,7 +1415,7 @@ def get_func(item, func):
             if func==str:
                 raise ValueError('Could not find a working conversion function')
             else: return get_func(item, funcmap[func])    # recurse
-        else: return func     
+        else: return func
 
 
     def get_converters(reader):
@@ -1427,40 +1432,40 @@ def get_converters(reader):
         return converters
 
 
-    # Get header and remove invalid characters 
+    # Get header and remove invalid characters
     header = reader.next()
     # remove these chars
     delete = set("""~!@#$%^&*()-=+~\|]}[{';: /?.>,<""")
     delete.add('"')
 
     names = []
-    
+
     for i, item in enumerate(header):
         item = item.strip().lower().replace(' ', '_')
         item = ''.join([c for c in item if c not in delete])
         if not len(item):
             item = 'column%d'%i
         names.append(item)
-        
+
     # get the converter functions by inspecting checkrows
     converters = get_converters(reader)
     if converters is None:
         raise ValueError('Could not find any valid data in CSV file')
-    
+
     # reset the reader and start over
     fh.seek(0)
     process_skiprows(reader)
     skipheader = reader.next()
-        
+
     # iterate over the remaining rows and convert the data to date
     # objects, ints, or floats as approriate
-    rows = []   
+    rows = []
     for i, row in enumerate(reader):
         if not len(row): continue
         if row[0].startswith(comments): continue
         rows.append([func(val) for func, val in zip(converters, row)])
     fh.close()
-    
+
     r = numpy.rec.fromrecords(rows, names=names)
     return r
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2007-06-11 Python 2.5 compatibility fix for mlab.py - EF`
	`2`	`+`
`1`	`3`	`2007-06-10 In matplotlibrc file, use 'dashed' \| 'solid' instead`
`2`	`4`	`of a pair of floats for contour.negative_linestyle - EF`
`3`	`5`