[Numpy-svn] r2817 - trunk/numpy/testing

[numpy-svn at scipy.org]

Author: cookedm
Date: 2006-07-14 03:02:08 -0500 (Fri, 14 Jul 2006)
New Revision: 2817

Modified:
   trunk/numpy/testing/numpytest.py
   trunk/numpy/testing/utils.py
Log:
`` -> repr in numpy.testing

Modified: trunk/numpy/testing/numpytest.py
===================================================================
--- trunk/numpy/testing/numpytest.py	2006-07-13 21:25:17 UTC (rev 2816)
+++ trunk/numpy/testing/numpytest.py	2006-07-14 08:02:08 UTC (rev 2817)
@@ -150,10 +150,12 @@
             l = len(result.stream.data)
             if errstr.startswith('IgnoreException:'):
                 if l==1:
-                    assert result.stream.data[-1]=='E',`result.stream.data`
+                    assert result.stream.data[-1]=='E', \
+                            repr(result.stream.data)
                     result.stream.data[-1] = 'i'
                 else:
-                    assert result.stream.data[-1]=='ERROR\n',`result.stream.data`
+                    assert result.stream.data[-1]=='ERROR\n', \
+                            repr(result.stream.data)
                     result.stream.data[-1] = 'ignoring\n'
                 del result.errors[-1]
         map(save_stream.write, result.stream.data)
@@ -300,7 +302,7 @@
         filename = module.__file__[-30:]
         if filename!=module.__file__:
             filename = '...'+filename
-        return '<module %s from %s>' % (`module.__name__`, `filename`)
+        return '<module %r from %r>' % (module.__name__, filename)
 
     def _get_method_names(self,clsobj,level):
         names = []

Modified: trunk/numpy/testing/utils.py
===================================================================
--- trunk/numpy/testing/utils.py	2006-07-13 21:25:17 UTC (rev 2816)
+++ trunk/numpy/testing/utils.py	2006-07-14 08:02:08 UTC (rev 2817)
@@ -123,10 +123,10 @@
         equal.  I think this should be part of unittest.py
     """
     if isinstance(desired, dict):
-        assert isinstance(actual, dict),`type(actual)`
+        assert isinstance(actual, dict), repr(type(actual))
         assert_equal(len(actual),len(desired),err_msg,verbose)
         for k,i in desired.items():
-            assert actual.has_key(k),`k`
+            assert actual.has_key(k), repr(k)
             assert_equal(actual[k], desired[k], 'key=%r\n%s' % (k,err_msg), verbose)
         return
     if isinstance(desired, (list,tuple)) and isinstance(actual, (list,tuple)):