[Scipy-svn] r3667 - in branches/io_new: matlab tests

[scipy-svn at scipy.org]

Author: brian.hawthorne
Date: 2007-12-15 15:04:05 -0600 (Sat, 15 Dec 2007)
New Revision: 3667

Added:
   branches/io_new/matlab/__init__.py
Modified:
   branches/io_new/matlab/mio.py
   branches/io_new/matlab/mio4.py
   branches/io_new/matlab/mio5.py
   branches/io_new/tests/test_mio.py
Log:
make matlab dir a package, use relative imports among matlab modules, and change test imports of matlab stuff to local instead of from scipy (enables tests to run in branch)

Added: branches/io_new/matlab/__init__.py
===================================================================

Modified: branches/io_new/matlab/mio.py
===================================================================
--- branches/io_new/matlab/mio.py	2007-12-15 20:12:57 UTC (rev 3666)
+++ branches/io_new/matlab/mio.py	2007-12-15 21:04:05 UTC (rev 3667)
@@ -7,8 +7,8 @@
 import os
 import sys
 
-from scipy.io.matlab.mio4 import MatFile4Reader, MatFile4Writer
-from scipy.io.matlab.mio5 import MatFile5Reader, MatFile5Writer
+from mio4 import MatFile4Reader, MatFile4Writer
+from mio5 import MatFile5Reader, MatFile5Writer
 
 __all__ = ['find_mat_file', 'mat_reader_factory', 'loadmat', 'savemat']
 

Modified: branches/io_new/matlab/mio4.py
===================================================================
--- branches/io_new/matlab/mio4.py	2007-12-15 20:12:57 UTC (rev 3666)
+++ branches/io_new/matlab/mio4.py	2007-12-15 21:04:05 UTC (rev 3667)
@@ -3,7 +3,7 @@
 
 import numpy as N
 
-from scipy.io.matlab.miobase import *
+from miobase import *
 
 miDOUBLE = 0
 miSINGLE = 1

Modified: branches/io_new/matlab/mio5.py
===================================================================
--- branches/io_new/matlab/mio5.py	2007-12-15 20:12:57 UTC (rev 3666)
+++ branches/io_new/matlab/mio5.py	2007-12-15 21:04:05 UTC (rev 3667)
@@ -31,7 +31,7 @@
 from cStringIO import StringIO
 import numpy as N
 
-from scipy.io.matlab.miobase import *
+from miobase import *
 
 try:  # Python 2.3 support
     from sets import Set as set

Modified: branches/io_new/tests/test_mio.py
===================================================================
--- branches/io_new/tests/test_mio.py	2007-12-15 20:12:57 UTC (rev 3666)
+++ branches/io_new/tests/test_mio.py	2007-12-15 21:04:05 UTC (rev 3667)
@@ -11,8 +11,8 @@
 import scipy.sparse as SP
 
 set_package_path()
-from scipy.io.matlab.mio import loadmat, savemat
-from scipy.io.matlab.mio5 import mat_obj, mat_struct
+from matlab.mio import loadmat, savemat
+from matlab.mio5 import mat_obj, mat_struct
 restore_path()
 
 try:  # Python 2.3 support