[Numpy-svn] r5969 - branches/1.2.x/numpy/testing

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-10-28 03:54:54 -0500 (Tue, 28 Oct 2008)
New Revision: 5969

Modified:
   branches/1.2.x/numpy/testing/utils.py
Log:
1.2.x: Backport r5968 from trunk: put measure in numpy.testing namespace.

Modified: branches/1.2.x/numpy/testing/utils.py
===================================================================
--- branches/1.2.x/numpy/testing/utils.py	2008-10-28 08:48:58 UTC (rev 5968)
+++ branches/1.2.x/numpy/testing/utils.py	2008-10-28 08:54:54 UTC (rev 5969)
@@ -12,7 +12,7 @@
            'assert_array_equal', 'assert_array_less', 'assert_string_equal',
            'assert_array_almost_equal', 'assert_raises', 'build_err_msg',
            'decorate_methods', 'jiffies', 'memusage', 'print_assert_equal',
-           'raises', 'rand', 'rundocs', 'runstring', 'verbose']
+           'raises', 'rand', 'rundocs', 'runstring', 'verbose', 'measure']
 
 verbose = 0