Mailman 3 August 2009 - Python-checkins

r74596 - in python/branches/py3k: Lib/importlib/_bootstrap.py Lib/importlib/test/import_/test___package__.py Misc/NEWS
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 21:53:48 2009 New Revision: 74596 Log: When the globals argument to importlib.__import__() contained any value for __package__, it was used. This was incorrect since it could be set to None to represent the fact that a proper value was unknown. Now None will trigger the calculation for __package__. Discovered when running importlib against test_importhooks. Modified: python/branches/py3k/Lib/importlib/_bootstrap.py python/branches/py3k/Lib/importlib/test/import_/test___package__.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/importlib/_bootstrap.py ============================================================================== --- python/branches/py3k/Lib/importlib/_bootstrap.py (original) +++ python/branches/py3k/Lib/importlib/_bootstrap.py Sun Aug 30 21:53:48 2009 @@ -922,10 +922,10 @@ if level == 0: module = _gcd_import(name) else: - # __package__ is not guaranteed to be defined. - try: - package = globals['__package__'] - except KeyError: + # __package__ is not guaranteed to be defined or could be set to None + # to represent that it's proper value is unknown + package = globals.get('__package__') + if package is None: package = globals['__name__'] if '__path__' not in globals: package = package.rpartition('.')[0] Modified: python/branches/py3k/Lib/importlib/test/import_/test___package__.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/import_/test___package__.py (original) +++ python/branches/py3k/Lib/importlib/test/import_/test___package__.py Sun Aug 30 21:53:48 2009 @@ -19,8 +19,9 @@ base = package.rsplit('.', level)[0] return '{0}.{1}'.format(base, name) - But since there is no guarantee that __package__ has been set, there has to - be a way to calculate the attribute's value [__name__]:: + But since there is no guarantee that __package__ has been set (or not been + set to None [None]), there has to be a way to calculate the attribute's value + [__name__]:: def calc_package(caller_name, has___path__): if has__path__: @@ -43,17 +44,22 @@ fromlist=['attr'], level=2) self.assertEquals(module.__name__, 'pkg') - def test_using___name__(self): + def test_using___name__(self, package_as_None=False): # [__name__] + globals_ = {'__name__': 'pkg.fake', '__path__': []} + if package_as_None: + globals_['__package__'] = None with util.mock_modules('pkg.__init__', 'pkg.fake') as importer: with util.import_state(meta_path=[importer]): import_util.import_('pkg.fake') - module = import_util.import_('', - globals={'__name__': 'pkg.fake', - '__path__': []}, - fromlist=['attr'], level=2) + module = import_util.import_('', globals= globals_, + fromlist=['attr'], level=2) self.assertEquals(module.__name__, 'pkg') + def test_None_as___package__(self): + # [None] + self.test_using___name__(package_as_None=True) + def test_bad__package__(self): globals = {'__package__': '<not real>'} with self.assertRaises(SystemError): Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Aug 30 21:53:48 2009 @@ -68,6 +68,9 @@ Library ------- +- When the globals past to importlib.__import__() has __package__ set to None, + fall back to computing what __package__ should be instead of giving up. + - Raise a TypeError when the name of a module to be imported for importlib.__import__ is not a string (was raising an AttributeError before).

1 0

r74595 - python/branches/py3k/Lib/importlib/test/regrtest.py
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 21:44:32 2009 New Revision: 74595 Log: Turn on verbose2 for importlib.test.regrtest so as to see failures when they occur. Modified: python/branches/py3k/Lib/importlib/test/regrtest.py Modified: python/branches/py3k/Lib/importlib/test/regrtest.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/regrtest.py (original) +++ python/branches/py3k/Lib/importlib/test/regrtest.py Sun Aug 30 21:44:32 2009 @@ -8,7 +8,6 @@ XXX FAILING test_import # execution bit, exception name differing, file name differing between code and module (?) - test_importhooks # package not set in _gcd_import() but level > 0 test_pep3120 # Difference in exception test_runpy # Importing sys.imp.eric raises AttributeError instead of ImportError (as does any attempt to import a sub-module @@ -34,4 +33,4 @@ # No programmatic way to specify tests to exclude sys.argv.extend(exclude) - regrtest.main(quiet=True) + regrtest.main(quiet=True, verbose2=True)

1 0

r74594 - in python/branches/py3k: Lib/importlib/_bootstrap.py Lib/importlib/test/import_/test_api.py Lib/importlib/test/regrtest.py Misc/NEWS
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 21:08:58 2009 New Revision: 74594 Log: Raise TypeError if the name given to importlib.__import__() lacks an rpartition attribute. Was throwing AttributeError before. Discovered when running test_builtin against importlib. This exception change is specific to importlib.__import__() and does not apply to import_module() as it is being done for compatibility reasons only. Added: python/branches/py3k/Lib/importlib/test/import_/test_api.py Modified: python/branches/py3k/Lib/importlib/_bootstrap.py python/branches/py3k/Lib/importlib/test/regrtest.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/importlib/_bootstrap.py ============================================================================== --- python/branches/py3k/Lib/importlib/_bootstrap.py (original) +++ python/branches/py3k/Lib/importlib/_bootstrap.py Sun Aug 30 21:08:58 2009 @@ -917,6 +917,8 @@ import (e.g. ``from ..pkg import mod`` would have a 'level' of 2). """ + if not hasattr(name, 'rpartition'): + raise TypeError("module name must be str, not {}".format(type(name))) if level == 0: module = _gcd_import(name) else: Added: python/branches/py3k/Lib/importlib/test/import_/test_api.py ============================================================================== --- (empty file) +++ python/branches/py3k/Lib/importlib/test/import_/test_api.py Sun Aug 30 21:08:58 2009 @@ -0,0 +1,22 @@ +from . import util +import unittest + + +class APITest(unittest.TestCase): + + """Test API-specific details for __import__ (e.g. raising the right + exception when passing in an int for the module name).""" + + def test_name_requires_rparition(self): + # Raise TypeError if a non-string is passed in for the module name. + with self.assertRaises(TypeError): + util.import_(42) + + +def test_main(): + from test.support import run_unittest + run_unittest(APITest) + + +if __name__ == '__main__': + test_main() Modified: python/branches/py3k/Lib/importlib/test/regrtest.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/regrtest.py (original) +++ python/branches/py3k/Lib/importlib/test/regrtest.py Sun Aug 30 21:08:58 2009 @@ -6,7 +6,6 @@ this script. XXX FAILING - test_builtin # Wanting a TypeError for an integer name test_import # execution bit, exception name differing, file name differing between code and module (?) test_importhooks # package not set in _gcd_import() but level > 0 Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Aug 30 21:08:58 2009 @@ -68,6 +68,10 @@ Library ------- +- Raise a TypeError when the name of a module to be imported for + importlib.__import__ is not a string (was raising an + AttributeError before). + - Allow the fromlist passed into importlib.__import__ to be any iterable. - Have importlib raise ImportError if None is found in sys.modules.

1 0

r74593 - python/branches/py3k/Lib/importlib/test/import_/util.py
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 20:59:21 2009 New Revision: 74593 Log: Fix the importlib_only test decorator to work again; don't capture the flag variable as it might change later. Modified: python/branches/py3k/Lib/importlib/test/import_/util.py Modified: python/branches/py3k/Lib/importlib/test/import_/util.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/import_/util.py (original) +++ python/branches/py3k/Lib/importlib/test/import_/util.py Sun Aug 30 20:59:21 2009 @@ -15,7 +15,9 @@ return importlib.__import__(*args, **kwargs) -importlib_only = unittest.skipIf(using___import__, "importlib-specific test") +def importlib_only(fxn): + """Decorator to skip a test if using __builtins__.__import__.""" + return unittest.skipIf(using___import__, "importlib-specific test")(fxn) def mock_path_hook(*entries, importer):

1 0

r74592 - python/branches/py3k/Lib/importlib/test/import_/util.py
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 20:40:23 2009 New Revision: 74592 Log: Use the public API, not a private one. Modified: python/branches/py3k/Lib/importlib/test/import_/util.py Modified: python/branches/py3k/Lib/importlib/test/import_/util.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/import_/util.py (original) +++ python/branches/py3k/Lib/importlib/test/import_/util.py Sun Aug 30 20:40:23 2009 @@ -12,7 +12,7 @@ if using___import__: return __import__(*args, **kwargs) else: - return importlib._bootstrap.__import__(*args, **kwargs) + return importlib.__import__(*args, **kwargs) importlib_only = unittest.skipIf(using___import__, "importlib-specific test")

1 0

r74591 - in python/branches/py3k: Lib/importlib/_bootstrap.py Lib/importlib/test/import_/test_fromlist.py Misc/NEWS
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 20:28:46 2009 New Revision: 74591 Log: Allow importlib.__import__ to accept any iterable for fromlist. Discovered when running importlib against test___all__. Modified: python/branches/py3k/Lib/importlib/_bootstrap.py python/branches/py3k/Lib/importlib/test/import_/test_fromlist.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/importlib/_bootstrap.py ============================================================================== --- python/branches/py3k/Lib/importlib/_bootstrap.py (original) +++ python/branches/py3k/Lib/importlib/_bootstrap.py Sun Aug 30 20:28:46 2009 @@ -943,6 +943,7 @@ # If a package was imported, try to import stuff from fromlist. if hasattr(module, '__path__'): if '*' in fromlist and hasattr(module, '__all__'): + fromlist = list(fromlist) fromlist.remove('*') fromlist.extend(module.__all__) for x in (y for y in fromlist if not hasattr(module,y)): Modified: python/branches/py3k/Lib/importlib/test/import_/test_fromlist.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/import_/test_fromlist.py (original) +++ python/branches/py3k/Lib/importlib/test/import_/test_fromlist.py Sun Aug 30 20:28:46 2009 @@ -84,16 +84,23 @@ module = import_util.import_('pkg.mod', fromlist=['']) self.assertEquals(module.__name__, 'pkg.mod') - def test_using_star(self): + def basic_star_test(self, fromlist=['*']): # [using *] with util.mock_modules('pkg.__init__', 'pkg.module') as mock: with util.import_state(meta_path=[mock]): mock['pkg'].__all__ = ['module'] - module = import_util.import_('pkg', fromlist=['*']) + module = import_util.import_('pkg', fromlist=fromlist) self.assertEquals(module.__name__, 'pkg') self.assertTrue(hasattr(module, 'module')) self.assertEqual(module.module.__name__, 'pkg.module') + def test_using_star(self): + # [using *] + self.basic_star_test() + + def test_fromlist_as_tuple(self): + self.basic_star_test(('*',)) + def test_star_with_others(self): # [using * with others] context = util.mock_modules('pkg.__init__', 'pkg.module1', 'pkg.module2') Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Aug 30 20:28:46 2009 @@ -68,6 +68,8 @@ Library ------- +- Allow the fromlist passed into importlib.__import__ to be any iterable. + - Have importlib raise ImportError if None is found in sys.modules. - Issue #6054: Do not normalize stored pathnames in tarfile.

1 0

r74590 - python/trunk/Doc/library/stdtypes.rst
by georg.brandl Aug. 30, 2009

Aug. 30, 2009

Author: georg.brandl Date: Sun Aug 30 13:51:53 2009 New Revision: 74590 Log: #6801: fix copy-paste oversight. Modified: python/trunk/Doc/library/stdtypes.rst Modified: python/trunk/Doc/library/stdtypes.rst ============================================================================== --- python/trunk/Doc/library/stdtypes.rst (original) +++ python/trunk/Doc/library/stdtypes.rst Sun Aug 30 13:51:53 2009 @@ -1787,7 +1787,7 @@ Accepts multiple input iterables. .. method:: symmetric_difference_update(other) - set ^= other | ... + set ^= other Update the set, keeping only elements found in either set, but not in both.

1 0

r74589 - in python/branches/py3k/Lib/importlib/test: __main__.py regrtest.py
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 10:39:57 2009 New Revision: 74589 Log: Provide module docstrings for the two main test drivers in importlib that explain what they are for and how to use command-line arguments to tweak semantics. Modified: python/branches/py3k/Lib/importlib/test/__main__.py python/branches/py3k/Lib/importlib/test/regrtest.py Modified: python/branches/py3k/Lib/importlib/test/__main__.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/__main__.py (original) +++ python/branches/py3k/Lib/importlib/test/__main__.py Sun Aug 30 10:39:57 2009 @@ -1,3 +1,9 @@ +"""Run importlib's test suite. + +Specifying the ``--builtin`` flag will run tests, where applicable, with +builtins.__import__ instead of importlib.__import__. + +""" import importlib from importlib.test.import_ import util import os.path Modified: python/branches/py3k/Lib/importlib/test/regrtest.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/regrtest.py (original) +++ python/branches/py3k/Lib/importlib/test/regrtest.py Sun Aug 30 10:39:57 2009 @@ -1,8 +1,11 @@ """Run Python's standard test suite using importlib.__import__. +Tests known to fail because of assumptions that importlib (properly) +invalidates are automatically skipped if the entire test suite is run. +Otherwise all command-line options valid for test.regrtest are also valid for +this script. + XXX FAILING - test___all__ # tuple being given for fromlist (looks like interpreter is - doing it) test_builtin # Wanting a TypeError for an integer name test_import # execution bit, exception name differing, file name differing between code and module (?)

1 0

r74588 - python/trunk/Doc/library/stdtypes.rst
by georg.brandl Aug. 30, 2009

Aug. 30, 2009

Author: georg.brandl Date: Sun Aug 30 10:35:01 2009 New Revision: 74588 Log: #6803: fix old name. Modified: python/trunk/Doc/library/stdtypes.rst Modified: python/trunk/Doc/library/stdtypes.rst ============================================================================== --- python/trunk/Doc/library/stdtypes.rst (original) +++ python/trunk/Doc/library/stdtypes.rst Sun Aug 30 10:35:01 2009 @@ -2549,9 +2549,9 @@ their implementation of the context management protocol. See the :mod:`contextlib` module for some examples. -Python's :term:`generator`\s and the ``contextlib.contextfactory`` :term:`decorator` +Python's :term:`generator`\s and the ``contextlib.contextmanager`` :term:`decorator` provide a convenient way to implement these protocols. If a generator function is -decorated with the ``contextlib.contextfactory`` decorator, it will return a +decorated with the ``contextlib.contextmanager`` decorator, it will return a context manager implementing the necessary :meth:`__enter__` and :meth:`__exit__` methods, rather than the iterator produced by an undecorated generator function.

1 0

r74587 - python/branches/py3k/Lib/importlib/test/regrtest.py
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 10:30:35 2009 New Revision: 74587 Log: Tweak importlib.test.regrtest to only specify the implicit tests to exclude when running entire test suite. Allows normal command-line arguments normally given to test.regrtest to work (e.g. specifying a single test). Modified: python/branches/py3k/Lib/importlib/test/regrtest.py Modified: python/branches/py3k/Lib/importlib/test/regrtest.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/regrtest.py (original) +++ python/branches/py3k/Lib/importlib/test/regrtest.py Sun Aug 30 10:30:35 2009 @@ -25,9 +25,11 @@ 'test_pkg', # Does not expect __loader__ attribute 'test_pydoc', # Does not expect __loader__ attribute ] - # No programmatic way to specify tests to exclude - sys.argv.extend(exclude) - # verbose=True, quiet=False for all failure info - # tests=[...] for specific tests to run + # Switching on --exclude implies running all test but the ones listed, so + # only use it when one is not running an explicit test + if len(sys.argv) == 1: + # No programmatic way to specify tests to exclude + sys.argv.extend(exclude) + regrtest.main(quiet=True)

1 0