mirror of
https://github.com/python/cpython.git
synced 2025-07-25 20:24:11 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! NOTE: The merge does NOT contain the modified file Python/import.c from r59288. I can't get it running. Nick, please check in the PEP 366 manually. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ........ r59279 | georg.brandl | 2007-12-02 19:17:50 +0100 (Sun, 02 Dec 2007) | 2 lines Fix a sentence I missed before. Do not merge to 3k. ........ r59281 | georg.brandl | 2007-12-02 22:58:54 +0100 (Sun, 02 Dec 2007) | 3 lines Add documentation for PySys_* functions. Written by Charlie Shepherd for GHOP. Also fixes #1245. ........ r59288 | nick.coghlan | 2007-12-03 13:55:17 +0100 (Mon, 03 Dec 2007) | 1 line Implement PEP 366 ........ r59290 | christian.heimes | 2007-12-03 14:47:29 +0100 (Mon, 03 Dec 2007) | 3 lines Applied my patch #1455 with some extra fixes for VS 2005 The new msvc9compiler module supports VS 2005 and VS 2008. I've also fixed build_ext to support PCbuild8 and PCbuild9 and backported my fix for xxmodule.c from py3k. The old code msvccompiler is still in place in case somebody likes to build an extension with VS 2003 or earlier. I've also updated the cygwin compiler module for VS 2005 and VS 2008. It works with VS 2005 but I'm unable to test it with VS 2008. We have to wait for a new version of cygwin. ........ r59291 | christian.heimes | 2007-12-03 14:55:16 +0100 (Mon, 03 Dec 2007) | 1 line Added comment to Misc/NEWS for r59290 ........ r59292 | christian.heimes | 2007-12-03 15:28:04 +0100 (Mon, 03 Dec 2007) | 1 line I followed MA Lemberg's suggestion and added comments to the late initialization of the type slots. ........ r59293 | facundo.batista | 2007-12-03 17:29:52 +0100 (Mon, 03 Dec 2007) | 3 lines Speedup and cleaning of __str__. Thanks Mark Dickinson. ........ r59294 | facundo.batista | 2007-12-03 18:55:00 +0100 (Mon, 03 Dec 2007) | 4 lines Faster _fix function, and some reordering for a more elegant coding. Thanks Mark Dickinson. ........ r59295 | martin.v.loewis | 2007-12-03 20:20:02 +0100 (Mon, 03 Dec 2007) | 5 lines Issue #1727780: Support loading pickles of random.Random objects created on 32-bit systems on 64-bit systems, and vice versa. As a consequence of the change, Random pickles created by Python 2.6 cannot be loaded in Python 2.5. ........ r59297 | facundo.batista | 2007-12-03 20:49:54 +0100 (Mon, 03 Dec 2007) | 3 lines Two small fixes. Issue 1547. ........ r59299 | georg.brandl | 2007-12-03 20:57:02 +0100 (Mon, 03 Dec 2007) | 2 lines #1548: fix apostroph placement. ........ r59300 | christian.heimes | 2007-12-03 21:01:02 +0100 (Mon, 03 Dec 2007) | 3 lines Patch #1537 from Chad Austin Change GeneratorExit's base class from Exception to BaseException (This time I'm applying the patch to the correct sandbox.) ........ r59302 | georg.brandl | 2007-12-03 21:03:46 +0100 (Mon, 03 Dec 2007) | 3 lines Add examples to the xmlrpclib docs. Written for GHOP by Josip Dzolonga. ........
278 lines
8.4 KiB
Python
278 lines
8.4 KiB
Python
# Test packages (dotted-name import)
|
|
|
|
import sys
|
|
import os
|
|
import tempfile
|
|
import textwrap
|
|
import traceback
|
|
import unittest
|
|
from test import test_support
|
|
|
|
|
|
# Helpers to create and destroy hierarchies.
|
|
|
|
def cleanout(root):
|
|
names = os.listdir(root)
|
|
for name in names:
|
|
fullname = os.path.join(root, name)
|
|
if os.path.isdir(fullname) and not os.path.islink(fullname):
|
|
cleanout(fullname)
|
|
else:
|
|
os.remove(fullname)
|
|
os.rmdir(root)
|
|
|
|
def fixdir(lst):
|
|
if "__builtins__" in lst:
|
|
lst.remove("__builtins__")
|
|
return lst
|
|
|
|
|
|
# XXX Things to test
|
|
#
|
|
# import package without __init__
|
|
# import package with __init__
|
|
# __init__ importing submodule
|
|
# __init__ importing global module
|
|
# __init__ defining variables
|
|
# submodule importing other submodule
|
|
# submodule importing global module
|
|
# submodule import submodule via global name
|
|
# from package import submodule
|
|
# from package import subpackage
|
|
# from package import variable (defined in __init__)
|
|
# from package import * (defined in __init__)
|
|
|
|
|
|
class TestPkg(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
self.root = None
|
|
self.syspath = list(sys.path)
|
|
self.sysmodules = sys.modules.copy()
|
|
|
|
def tearDown(self):
|
|
sys.path[:] = self.syspath
|
|
sys.modules.clear()
|
|
sys.modules.update(self.sysmodules)
|
|
del self.sysmodules
|
|
cleanout(self.root)
|
|
|
|
def run_code(self, code):
|
|
exec(textwrap.dedent(code), globals(), {"self": self})
|
|
|
|
def mkhier(self, descr):
|
|
root = tempfile.mkdtemp()
|
|
sys.path.insert(0, root)
|
|
if not os.path.isdir(root):
|
|
os.mkdir(root)
|
|
for name, contents in descr:
|
|
comps = name.split()
|
|
fullname = root
|
|
for c in comps:
|
|
fullname = os.path.join(fullname, c)
|
|
if contents is None:
|
|
os.mkdir(fullname)
|
|
else:
|
|
f = open(fullname, "w")
|
|
f.write(contents)
|
|
if contents and contents[-1] != '\n':
|
|
f.write('\n')
|
|
f.close()
|
|
self.root = root
|
|
|
|
def test_1(self):
|
|
hier = [("t1", None), ("t1 __init__.py", "")]
|
|
self.mkhier(hier)
|
|
import t1
|
|
|
|
def test_2(self):
|
|
hier = [
|
|
("t2", None),
|
|
("t2 __init__.py", "'doc for t2'"),
|
|
("t2 sub", None),
|
|
("t2 sub __init__.py", ""),
|
|
("t2 sub subsub", None),
|
|
("t2 sub subsub __init__.py", "spam = 1"),
|
|
]
|
|
self.mkhier(hier)
|
|
|
|
import t2
|
|
self.assertEqual(t2.__doc__, "doc for t2")
|
|
|
|
import t2.sub
|
|
import t2.sub.subsub
|
|
self.assertEqual(t2.__name__, "t2")
|
|
self.assertEqual(t2.sub.__name__, "t2.sub")
|
|
self.assertEqual(t2.sub.subsub.__name__, "t2.sub.subsub")
|
|
|
|
# This exec crap is needed because Py3k forbids 'import *' outside
|
|
# of module-scope and __import__() is insufficient for what we need.
|
|
s = """
|
|
import t2
|
|
from t2 import *
|
|
self.assertEqual(dir(), ['self', 'sub', 't2'])
|
|
"""
|
|
self.run_code(s)
|
|
|
|
from t2 import sub
|
|
from t2.sub import subsub
|
|
from t2.sub.subsub import spam
|
|
self.assertEqual(sub.__name__, "t2.sub")
|
|
self.assertEqual(subsub.__name__, "t2.sub.subsub")
|
|
self.assertEqual(sub.subsub.__name__, "t2.sub.subsub")
|
|
for name in ['spam', 'sub', 'subsub', 't2']:
|
|
self.failUnless(locals()["name"], "Failed to import %s" % name)
|
|
|
|
import t2.sub
|
|
import t2.sub.subsub
|
|
self.assertEqual(t2.__name__, "t2")
|
|
self.assertEqual(t2.sub.__name__, "t2.sub")
|
|
self.assertEqual(t2.sub.subsub.__name__, "t2.sub.subsub")
|
|
|
|
s = """
|
|
from t2 import *
|
|
self.failUnless(dir(), ['self', 'sub'])
|
|
"""
|
|
self.run_code(s)
|
|
|
|
def test_3(self):
|
|
hier = [
|
|
("t3", None),
|
|
("t3 __init__.py", ""),
|
|
("t3 sub", None),
|
|
("t3 sub __init__.py", ""),
|
|
("t3 sub subsub", None),
|
|
("t3 sub subsub __init__.py", "spam = 1"),
|
|
]
|
|
self.mkhier(hier)
|
|
|
|
import t3.sub.subsub
|
|
self.assertEqual(t3.__name__, "t3")
|
|
self.assertEqual(t3.sub.__name__, "t3.sub")
|
|
self.assertEqual(t3.sub.subsub.__name__, "t3.sub.subsub")
|
|
|
|
def test_4(self):
|
|
hier = [
|
|
("t4.py", "raise RuntimeError('Shouldnt load t4.py')"),
|
|
("t4", None),
|
|
("t4 __init__.py", ""),
|
|
("t4 sub.py", "raise RuntimeError('Shouldnt load sub.py')"),
|
|
("t4 sub", None),
|
|
("t4 sub __init__.py", ""),
|
|
("t4 sub subsub.py",
|
|
"raise RuntimeError('Shouldnt load subsub.py')"),
|
|
("t4 sub subsub", None),
|
|
("t4 sub subsub __init__.py", "spam = 1"),
|
|
]
|
|
self.mkhier(hier)
|
|
|
|
s = """
|
|
from t4.sub.subsub import *
|
|
self.assertEqual(spam, 1)
|
|
"""
|
|
self.run_code(s)
|
|
|
|
def test_5(self):
|
|
hier = [
|
|
("t5", None),
|
|
("t5 __init__.py", "import t5.foo"),
|
|
("t5 string.py", "spam = 1"),
|
|
("t5 foo.py",
|
|
"from . import string; assert string.spam == 1"),
|
|
]
|
|
self.mkhier(hier)
|
|
|
|
import t5
|
|
s = """
|
|
from t5 import *
|
|
self.assertEqual(dir(), ['foo', 'self', 'string', 't5'])
|
|
"""
|
|
self.run_code(s)
|
|
|
|
import t5
|
|
self.assertEqual(fixdir(dir(t5)),
|
|
['__doc__', '__file__', '__name__',
|
|
'__package__', '__path__', 'foo', 'string', 't5'])
|
|
self.assertEqual(fixdir(dir(t5.foo)),
|
|
['__doc__', '__file__', '__name__', '__package__',
|
|
'string'])
|
|
self.assertEqual(fixdir(dir(t5.string)),
|
|
['__doc__', '__file__', '__name__','__package__',
|
|
'spam'])
|
|
|
|
def test_6(self):
|
|
hier = [
|
|
("t6", None),
|
|
("t6 __init__.py",
|
|
"__all__ = ['spam', 'ham', 'eggs']"),
|
|
("t6 spam.py", ""),
|
|
("t6 ham.py", ""),
|
|
("t6 eggs.py", ""),
|
|
]
|
|
self.mkhier(hier)
|
|
|
|
import t6
|
|
self.assertEqual(fixdir(dir(t6)),
|
|
['__all__', '__doc__', '__file__',
|
|
'__name__', '__package__', '__path__'])
|
|
s = """
|
|
import t6
|
|
from t6 import *
|
|
self.assertEqual(fixdir(dir(t6)),
|
|
['__all__', '__doc__', '__file__',
|
|
'__name__', '__package__', '__path__',
|
|
'eggs', 'ham', 'spam'])
|
|
self.assertEqual(dir(), ['eggs', 'ham', 'self', 'spam', 't6'])
|
|
"""
|
|
self.run_code(s)
|
|
|
|
def test_7(self):
|
|
hier = [
|
|
("t7.py", ""),
|
|
("t7", None),
|
|
("t7 __init__.py", ""),
|
|
("t7 sub.py",
|
|
"raise RuntimeError('Shouldnt load sub.py')"),
|
|
("t7 sub", None),
|
|
("t7 sub __init__.py", ""),
|
|
("t7 sub .py",
|
|
"raise RuntimeError('Shouldnt load subsub.py')"),
|
|
("t7 sub subsub", None),
|
|
("t7 sub subsub __init__.py",
|
|
"spam = 1"),
|
|
]
|
|
self.mkhier(hier)
|
|
|
|
|
|
t7, sub, subsub = None, None, None
|
|
import t7 as tas
|
|
self.assertEqual(fixdir(dir(tas)),
|
|
['__doc__', '__file__', '__name__',
|
|
'__package__', '__path__'])
|
|
self.failIf(t7)
|
|
from t7 import sub as subpar
|
|
self.assertEqual(fixdir(dir(subpar)),
|
|
['__doc__', '__file__', '__name__',
|
|
'__package__', '__path__'])
|
|
self.failIf(t7)
|
|
self.failIf(sub)
|
|
from t7.sub import subsub as subsubsub
|
|
self.assertEqual(fixdir(dir(subsubsub)),
|
|
['__doc__', '__file__', '__name__',
|
|
'__package__', '__path__', 'spam'])
|
|
self.failIf(t7)
|
|
self.failIf(sub)
|
|
self.failIf(subsub)
|
|
from t7.sub.subsub import spam as ham
|
|
self.assertEqual(ham, 1)
|
|
self.failIf(t7)
|
|
self.failIf(sub)
|
|
self.failIf(subsub)
|
|
|
|
|
|
def test_main():
|
|
test_support.run_unittest(__name__)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|