[pypy-svn] r4761 - in pypy/trunk/src/pypy/module/test: . impsubdir impsubdir/pkg

[alex at codespeak.net]

Author: alex
Date: Mon May 31 16:39:48 2004
New Revision: 4761

Modified:
   pypy/trunk/src/pypy/module/test/impsubdir/a.py
   pypy/trunk/src/pypy/module/test/impsubdir/pkg/a.py
   pypy/trunk/src/pypy/module/test/test_import.py
Log:
start testing the from statement



Modified: pypy/trunk/src/pypy/module/test/impsubdir/a.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/impsubdir/a.py	(original)
+++ pypy/trunk/src/pypy/module/test/impsubdir/a.py	Mon May 31 16:39:48 2004
@@ -1 +1,2 @@
 # a.py
+imamodule = 1

Modified: pypy/trunk/src/pypy/module/test/impsubdir/pkg/a.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/impsubdir/pkg/a.py	(original)
+++ pypy/trunk/src/pypy/module/test/impsubdir/pkg/a.py	Mon May 31 16:39:48 2004
@@ -1 +1,2 @@
 # a.py
+imamodule = 1

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 16:39:48 2004
@@ -47,8 +47,21 @@
       import ambig
       self.assert_('ambig' in sys.modules)
       self.assert_(hasattr(ambig,'imapackage'))
-       
-if __name__ == '__main__':
-    testit.main()
 
+   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)
 
+if __name__ == '__main__':
+    testit.main()