[Python-checkins] r57210 - sandbox/trunk/import_in_py/tests/py_help.py sandbox/trunk/import_in_py/tests/test_fs_loader.py

[brett.cannon]

Author: brett.cannon
Date: Mon Aug 20 04:09:10 2007
New Revision: 57210

Modified:
   sandbox/trunk/import_in_py/tests/py_help.py
   sandbox/trunk/import_in_py/tests/test_fs_loader.py
Log:
Add an attribute pointing to the bytecode for the test package's __init__ file.


Modified: sandbox/trunk/import_in_py/tests/py_help.py
==============================================================================
--- sandbox/trunk/import_in_py/tests/py_help.py	(original)
+++ sandbox/trunk/import_in_py/tests/py_help.py	Mon Aug 20 04:09:10 2007
@@ -110,6 +110,8 @@
             os.mkdir(self.pkg_path)
         self.pkg_init_path = os.path.join(self.pkg_path,
                                             '__init__'+self.py_ext)
+        self.pkg_init_pyc_path = os.path.join(self.pkg_path,
+                                                '__init__'+self.pyc_ext)
         with open(self.pkg_init_path, 'w') as pkg_file:
             pkg_file.write(self.source)
         self.pkg_module_name = '.'.join([self.pkg_name, self.module_name])
@@ -147,8 +149,7 @@
                                 self.test_attr[1])
         if module.__name__ == self.pkg_name:
             self.failUnless(module.__file__ in
-                            [os.path.join(self.pkg_path, '__init__'+ext)
-                                for ext in [self.py_ext, self.pyc_ext]])
+                            [self.pkg_init_path, self.pkg_init_pyc_path])
             self.failUnlessEqual(module.__path__, [self.pkg_path])
             # Module in top-level package.
             if actual_name and self.pkg_module_name in actual_name:

Modified: sandbox/trunk/import_in_py/tests/test_fs_loader.py
==============================================================================
--- sandbox/trunk/import_in_py/tests/test_fs_loader.py	(original)
+++ sandbox/trunk/import_in_py/tests/test_fs_loader.py	Mon Aug 20 04:09:10 2007
@@ -155,8 +155,7 @@
         # Should be able to load even if only bytecode is available (top-level
         # or package).
         to_test = [(self.module_name, self.py_path, self.pyc_path, False),
-                   (self.pkg_name, self.pkg_init_path,
-                       os.path.join(self.pkg_path, '__init__' + self.pyc_ext),
+                   (self.pkg_name, self.pkg_init_path, self.pkg_init_pyc_path,
                        True)]
         for name, source_path, bytecode_path, is_pkg in to_test:
             py_compile.compile(source_path)