[pypy-svn] r4765 - in pypy/trunk/src/pypy/module/test: . impsubdir impsubdir/ambig impsubdir/pkg impsubdir/pkg/pkg1

[hpk at codespeak.net]

Author: hpk
Date: Mon May 31 17:01:35 2004
New Revision: 4765

Modified:
   pypy/trunk/src/pypy/module/test/impsubdir/   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/a.py   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/ambig/   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/ambig.py   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/ambig/__init__.py   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/pkg/   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/pkg/__init__.py   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/pkg/a.py   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/pkg/pkg1/   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/pkg/pkg1/__init__.py   (props changed)
   pypy/trunk/src/pypy/module/test/impsubdir/pkg/pkg1/a.py   (props changed)
   pypy/trunk/src/pypy/module/test/test_import.py   (contents, props changed)
Log:
fixeol + fixtabbing of test_import 


Modified: pypy/trunk/src/pypy/module/test/test_import.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_import.py	(original)
+++ pypy/trunk/src/pypy/module/test/test_import.py	Mon May 31 17:01:35 2004
@@ -3,73 +3,73 @@
 
 class TestImport(testit.AppTestCase):
 
-   def setUp(self): # interpreter-level
-      self.space = testit.new_objspace()
+    def setUp(self): # interpreter-level
+        self.space = testit.new_objspace()
 
-   def test_import_sys(self):
-      import sys
+    def test_import_sys(self):
+        import sys
 
-   def test_import_a(self):
-      import sys
-      sys.path.append('impsubdir')
-      import a
-      self.assert_('a' in sys.modules)
-
-   def test_import_bare_dir_fails(self):
-      def imp():
-         import impsubdir
-      self.assertRaises(ImportError,imp)
-
-   def test_import_pkg(self):
-      import sys
-      sys.path.append('impsubdir')
-      import pkg
-      self.assert_('pkg' in sys.modules)
-
-   def test_import_dotted(self):
-      import sys
-      sys.path.append('impsubdir')
-      import pkg.a
-      self.assert_('pkg' in sys.modules)
-      self.assert_('pkg.a' in sys.modules)
-
-   def test_import_dotted2(self):
-      import sys
-      sys.path.append('impsubdir')
-      import pkg.pkg1.a
-      self.assert_('pkg' in sys.modules)
-      self.assert_('pkg.pkg1' in sys.modules)
-      self.assert_('pkg.pkg1.a' in sys.modules)
-
-   def test_import_ambig(self):
-      import sys
-      sys.path.append('impsubdir')
-      import ambig
-      self.assert_('ambig' in sys.modules)
-      self.assert_(hasattr(ambig,'imapackage'))
-
-   def test_from_a(self):
-      import sys
-      sys.path.append('impsubdir')
-      from a import imamodule
-      self.assert_('a' in sys.modules)
-      self.assertEquals(imamodule, 1)
-
-   def test_from_dotted(self):
-      import sys
-      sys.path.append('impsubdir')
-      from pkg.a import imamodule
-      self.assert_('pkg' in sys.modules)
-      self.assert_('pkg.a' in sys.modules)
-      self.assertEquals(imamodule, 1)
-
-   def test_from_pkg_import_module(self):
-      import sys
-      sys.path.append('impsubdir')
-      from pkg import a
-      self.assert_('pkg' in sys.modules)
-      self.assert_('pkg.a' in sys.modules)
-      self.assert_(hasattr(a, 'imamodule'))
+    def test_import_a(self):
+        import sys
+        sys.path.append('impsubdir')
+        import a
+        self.assert_('a' in sys.modules)
+
+    def test_import_bare_dir_fails(self):
+        def imp():
+           import impsubdir
+        self.assertRaises(ImportError,imp)
+
+    def test_import_pkg(self):
+        import sys
+        sys.path.append('impsubdir')
+        import pkg
+        self.assert_('pkg' in sys.modules)
+
+    def test_import_dotted(self):
+        import sys
+        sys.path.append('impsubdir')
+        import pkg.a
+        self.assert_('pkg' in sys.modules)
+        self.assert_('pkg.a' in sys.modules)
+
+    def test_import_dotted2(self):
+        import sys
+        sys.path.append('impsubdir')
+        import pkg.pkg1.a
+        self.assert_('pkg' in sys.modules)
+        self.assert_('pkg.pkg1' in sys.modules)
+        self.assert_('pkg.pkg1.a' in sys.modules)
+
+    def test_import_ambig(self):
+        import sys
+        sys.path.append('impsubdir')
+        import ambig
+        self.assert_('ambig' in sys.modules)
+        self.assert_(hasattr(ambig,'imapackage'))
+
+    def test_from_a(self):
+        import sys
+        sys.path.append('impsubdir')
+        from a import imamodule
+        self.assert_('a' in sys.modules)
+        self.assertEquals(imamodule, 1)
+
+    def test_from_dotted(self):
+        import sys
+        sys.path.append('impsubdir')
+        from pkg.a import imamodule
+        self.assert_('pkg' in sys.modules)
+        self.assert_('pkg.a' in sys.modules)
+        self.assertEquals(imamodule, 1)
+
+    def test_from_pkg_import_module(self):
+        import sys
+        sys.path.append('impsubdir')
+        from pkg import a
+        self.assert_('pkg' in sys.modules)
+        self.assert_('pkg.a' in sys.modules)
+        self.assert_(hasattr(a, 'imamodule'))
 
 if __name__ == '__main__':
     testit.main()