[Scipy-svn] r6423 - in trunk/scipy/io/matlab: . tests

[scipy-svn at scipy.org]

Author: matthew.brett at gmail.com
Date: 2010-05-29 16:47:45 -0500 (Sat, 29 May 2010)
New Revision: 6423

Modified:
   trunk/scipy/io/matlab/mio.py
   trunk/scipy/io/matlab/miobase.py
   trunk/scipy/io/matlab/tests/test_mio.py
Log:
RF - removed basename kwarg

Modified: trunk/scipy/io/matlab/mio.py
===================================================================
--- trunk/scipy/io/matlab/mio.py	2010-05-29 21:18:39 UTC (rev 6422)
+++ trunk/scipy/io/matlab/mio.py	2010-05-29 21:47:45 UTC (rev 6423)
@@ -62,7 +62,6 @@
     ----------
     %(file_arg)s
     %(append_arg)s
-    %(basename_arg)s
     %(load_args)s
     %(struct_arg)s
 
@@ -86,12 +85,6 @@
         except AttributeError:
             raise IOError, 'Reader needs file name or open file-like object'
         byte_stream = file_name
-    # Deal with deprecations
-    if kwargs.has_key('basename'):
-        warnings.warn(
-            'basename argument will be removed in future scipy versions',
-            DeprecationWarning, stacklevel=2)
-        del kwargs['basename']
     mjv, mnv = get_matfile_version(byte_stream)
     if mjv == 0:
         return MatFile4Reader(byte_stream, **kwargs)
@@ -112,7 +105,6 @@
     m_dict : dict, optional
         dictionary in which to insert matfile variables
     %(append_arg)s
-    %(basename_arg)s
     %(load_args)s
     %(struct_arg)s
 

Modified: trunk/scipy/io/matlab/miobase.py
===================================================================
--- trunk/scipy/io/matlab/miobase.py	2010-05-29 21:18:39 UTC (rev 6422)
+++ trunk/scipy/io/matlab/miobase.py	2010-05-29 21:47:45 UTC (rev 6423)
@@ -25,11 +25,6 @@
          '''appendmat : {True, False} optional
    True to append the .mat extension to the end of the given
    filename, if not already present''',
-     'basename_arg':
-         '''base_name : string, optional, unused
-   base name for unnamed variables.  The code no longer uses
-   this.  We deprecate for this version of scipy, and will remove
-   it in future versions''',
      'load_args':
          '''byte_order : {None, string}, optional
    None by default, implying byte order guessed from mat

Modified: trunk/scipy/io/matlab/tests/test_mio.py
===================================================================
--- trunk/scipy/io/matlab/tests/test_mio.py	2010-05-29 21:18:39 UTC (rev 6422)
+++ trunk/scipy/io/matlab/tests/test_mio.py	2010-05-29 21:47:45 UTC (rev 6423)
@@ -363,10 +363,6 @@
     yield assert_raises, FutureWarning, loadmat, fname
     # This too
     yield assert_raises, FutureWarning, find_mat_file, fname
-    # we need kwargs for this one
-    yield (lambda a, k: assert_raises(*a, **k),
-          (DeprecationWarning, loadmat, fname),
-          {'struct_as_record':True, 'basename':'raw'})
     warnings.resetwarnings()