[pypy-svn] r54261 - in pypy/dist/pypy: doc doc/config doc/discussion jit/codegen/cli jit/codegen/cli/test lib module/_file/test module/clr module/posix/test objspace/flow/test rlib rlib/test rpython/memory/gctransform rpython/memory/test rpython/module/test rpython/test tool tool/algo/test translator/goal translator/jvm translator/jvm/test translator/llvm translator/llvm/test translator/oosupport/test_template

[arigo at codespeak.net]

Author: arigo
Date: Wed Apr 30 11:54:30 2008
New Revision: 54261

Modified:
   pypy/dist/pypy/doc/config/translation.llvm.opt_options.txt   (props changed)
   pypy/dist/pypy/doc/discussion/paper-wishlist.txt   (props changed)
   pypy/dist/pypy/doc/home.txt   (props changed)
   pypy/dist/pypy/jit/codegen/cli/   (props changed)
   pypy/dist/pypy/jit/codegen/cli/test/   (props changed)
   pypy/dist/pypy/lib/readline.py   (props changed)
   pypy/dist/pypy/module/_file/test/test_large_file.py   (props changed)
   pypy/dist/pypy/module/clr/app_importer.py   (props changed)
   pypy/dist/pypy/module/posix/test/__init__.py   (props changed)
   pypy/dist/pypy/objspace/flow/test/test___import__.py   (contents, props changed)
   pypy/dist/pypy/rlib/rjvm.py   (props changed)
   pypy/dist/pypy/rlib/test/test_rjvm.py   (props changed)
   pypy/dist/pypy/rpython/memory/gctransform/asmgcroot.py   (props changed)
   pypy/dist/pypy/rpython/memory/gctransform/llvmgcroot.py   (props changed)
   pypy/dist/pypy/rpython/memory/test/snippet.py   (props changed)
   pypy/dist/pypy/rpython/module/test/execve_tests.py   (props changed)
   pypy/dist/pypy/rpython/test/test_stack.py   (props changed)
   pypy/dist/pypy/tool/algo/test/test_unionfind.py   (props changed)
   pypy/dist/pypy/tool/descriptor.py   (props changed)
   pypy/dist/pypy/translator/goal/targetimageloadingsmalltalk.py   (props changed)
   pypy/dist/pypy/translator/jvm/cmpopcodes.py   (props changed)
   pypy/dist/pypy/translator/jvm/test/test_extreme.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_bigtest.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_newgc.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_rbool.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_rbuiltin.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_rconstantdict.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_rfloat.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_rint.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_rlist.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_rpbc.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_rstr.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_rtuple.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_runtest.py   (props changed)
   pypy/dist/pypy/translator/llvm/test/test_standalone.py   (props changed)
   pypy/dist/pypy/translator/llvm/typedefnode.py   (props changed)
   pypy/dist/pypy/translator/oosupport/test_template/extreme.py   (props changed)
Log:
fixeol


Modified: pypy/dist/pypy/objspace/flow/test/test___import__.py
==============================================================================
--- pypy/dist/pypy/objspace/flow/test/test___import__.py	(original)
+++ pypy/dist/pypy/objspace/flow/test/test___import__.py	Wed Apr 30 11:54:30 2008
@@ -1,12 +1,12 @@
-from py.test import raises
-
-def test___import_():
-    import os
-    mod = os.name
-    raises(TypeError, __import__, ())
-    assert __import__(mod).__name__ == os.name
-    assert __import__(mod, None).__name__ == os.name
-    assert __import__(mod, None, None).__name__ == os.name
-    assert __import__(mod, None, None, None).__name__ == os.name
-    raises(TypeError, __import__, (mod, None, None, None, None))
+from py.test import raises
+
+def test___import_():
+    import os
+    mod = os.name
+    raises(TypeError, __import__, ())
+    assert __import__(mod).__name__ == os.name
+    assert __import__(mod, None).__name__ == os.name
+    assert __import__(mod, None, None).__name__ == os.name
+    assert __import__(mod, None, None, None).__name__ == os.name
+    raises(TypeError, __import__, (mod, None, None, None, None))
     # XXX this will have to be adjusted for Python 2.5 pretty soon-ish :-)
\ No newline at end of file