[Scipy-svn] r6794 - trunk/scipy/misc/tests

[scipy-svn at scipy.org]

Author: warren.weckesser
Date: 2010-09-12 16:22:23 -0500 (Sun, 12 Sep 2010)
New Revision: 6794

Modified:
   trunk/scipy/misc/tests/test_pilutil.py
Log:
TST: misc: Don't use 'import *'. Don't use plain 'assert'.

Modified: trunk/scipy/misc/tests/test_pilutil.py
===================================================================
--- trunk/scipy/misc/tests/test_pilutil.py	2010-09-12 21:21:43 UTC (rev 6793)
+++ trunk/scipy/misc/tests/test_pilutil.py	2010-09-12 21:22:23 UTC (rev 6794)
@@ -1,7 +1,8 @@
 import os.path
 import numpy as np
 
-from numpy.testing import *
+from numpy.testing import assert_, assert_equal, \
+        dec, decorate_methods, TestCase, run_module_suite
 
 try:
     import PIL.Image
@@ -42,8 +43,8 @@
 def tst_fromimage(filename, irange):
     img = pilutil.fromimage(PIL.Image.open(filename))
     imin,imax = irange
-    assert img.min() >= imin
-    assert img.max() <= imax
+    assert_(img.min() >= imin)
+    assert_(img.max() <= imax)
 
 @_pilskip
 def test_fromimage():