[pypy-svn] r74684 - pypy/trunk/lib-python

[hpk at codespeak.net]

Author: hpk
Date: Sat May 22 22:30:41 2010
New Revision: 74684

Modified:
   pypy/trunk/lib-python/conftest.py
Log:
forgot to svn-up, this line is redundant


Modified: pypy/trunk/lib-python/conftest.py
==============================================================================
--- pypy/trunk/lib-python/conftest.py	(original)
+++ pypy/trunk/lib-python/conftest.py	Sat May 22 22:30:41 2010
@@ -42,7 +42,6 @@
     from test import pystone
     timeout = option.timeout.lower()
     if timeout.endswith('mp'): 
-        from test import pystone
         megapystone = float(timeout[:-2])
         t, stone = pystone.Proc0(10000)
         pystonetime = t/stone