[Scipy-svn] r2216 - trunk/Lib/io

[scipy-svn at scipy.org]

Author: matthew.brett at gmail.com
Date: 2006-09-22 13:44:31 -0500 (Fri, 22 Sep 2006)
New Revision: 2216

Modified:
   trunk/Lib/io/mio5.py
   trunk/Lib/io/miobase.py
Log:
Tiny fix for indexing error with some numpy versions

Modified: trunk/Lib/io/mio5.py
===================================================================
--- trunk/Lib/io/mio5.py	2006-09-22 14:18:28 UTC (rev 2215)
+++ trunk/Lib/io/mio5.py	2006-09-22 18:44:31 UTC (rev 2216)
@@ -162,7 +162,7 @@
             el_count = byte_count / dt.itemsize
             return ndarray(shape=(el_count,),
                            dtype=dt,
-                           buffer=raw_tag[4:4+byte_count])
+                           buffer=raw_tag[4:])
         byte_count = tag['byte_count']
         if mdtype == miMATRIX:
             return self.current_getter(byte_count).get_array()

Modified: trunk/Lib/io/miobase.py
===================================================================
--- trunk/Lib/io/miobase.py	2006-09-22 14:18:28 UTC (rev 2215)
+++ trunk/Lib/io/miobase.py	2006-09-22 18:44:31 UTC (rev 2216)
@@ -120,7 +120,6 @@
         self.squeeze_me = squeeze_me
         self.chars_as_strings = chars_as_strings
         self.matlab_compatible = matlab_compatible
-        self.processor_func = self.get_processor_func()
         
     # matlab_compatible property sets squeeze_me and chars_as_strings
     def get_matlab_compatible(self):
@@ -130,6 +129,7 @@
         if matlab_compatible:
             self.squeeze_me = False
             self.char_as_strings = False
+        self.processor_func = self.get_processor_func()
     matlab_compatible = property(get_matlab_compatible,
                                  set_matlab_compatible,
                                  None,