Mailman 3 August 2009 - Python-checkins

r74605 - in python/branches/py3k: Makefile.pre.in
by mark.dickinson Aug. 31, 2009

Aug. 31, 2009

Author: mark.dickinson Date: Mon Aug 31 16:52:10 2009 New Revision: 74605 Log: Merged revisions 74604 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74604 | mark.dickinson | 2009-08-31 15:46:07 +0100 (Mon, 31 Aug 2009) | 1 line Issue #6297: Add autogenerated Misc/python.pc file to make distclean target. Thanks Jerry Chen. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Makefile.pre.in Modified: python/branches/py3k/Makefile.pre.in ============================================================================== --- python/branches/py3k/Makefile.pre.in (original) +++ python/branches/py3k/Makefile.pre.in Mon Aug 31 16:52:10 2009 @@ -1184,7 +1184,8 @@ distclean: clobber -rm -f Lib/test/data/* -rm -f core Makefile Makefile.pre config.status \ - Modules/Setup Modules/Setup.local Modules/Setup.config + Modules/Setup Modules/Setup.local Modules/Setup.config \ + Misc/python.pc find $(srcdir) '(' -name '*.fdc' -o -name '*~' \ -o -name '[@,#]*' -o -name '*.old' \ -o -name '*.orig' -o -name '*.rej' \

1 0

r74604 - python/trunk/Makefile.pre.in
by mark.dickinson Aug. 31, 2009

Aug. 31, 2009

Author: mark.dickinson Date: Mon Aug 31 16:46:07 2009 New Revision: 74604 Log: Add autogenerated Misc/python.pc file to make distclean target. Thanks Jerry Chen. Modified: python/trunk/Makefile.pre.in Modified: python/trunk/Makefile.pre.in ============================================================================== --- python/trunk/Makefile.pre.in (original) +++ python/trunk/Makefile.pre.in Mon Aug 31 16:46:07 2009 @@ -1176,7 +1176,8 @@ distclean: clobber -rm -f Lib/test/data/* -rm -f core Makefile Makefile.pre config.status \ - Modules/Setup Modules/Setup.local Modules/Setup.config + Modules/Setup Modules/Setup.local Modules/Setup.config \ + Misc/python.pc find $(srcdir) '(' -name '*.fdc' -o -name '*~' \ -o -name '[@,#]*' -o -name '*.old' \ -o -name '*.orig' -o -name '*.rej' \

1 0

Python Regression Test Failures refleak (1)
by Neal Norwitz Aug. 31, 2009

Aug. 31, 2009

More important issues: ---------------------- test_ssl leaked [0, -81, 420] references, sum=339 Less important issues: ---------------------- test_cmd_line leaked [-25, 0, 0] references, sum=-25 test_file2k leaked [0, 69, 13] references, sum=82 test_socketserver leaked [80, -80, 0] references, sum=0 test_sys leaked [42, -21, -21] references, sum=0 test_threading leaked [48, 48, 48] references, sum=144 test_urllib2_localnet leaked [280, -280, 0] references, sum=0

1 0

r74603 - python/trunk/Doc/library/stdtypes.rst
by georg.brandl Aug. 31, 2009

Aug. 31, 2009

Author: georg.brandl Date: Mon Aug 31 08:38:29 2009 New Revision: 74603 Log: other -> others where multiple arguments are accepted. 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 Mon Aug 31 08:38:29 2009 @@ -1765,7 +1765,7 @@ .. method:: update(other, ...) set |= other | ... - Update the set, adding elements from *other*. + Update the set, adding elements from all others. .. versionchanged:: 2.6 Accepts multiple input iterables. @@ -1773,7 +1773,7 @@ .. method:: intersection_update(other, ...) set &= other & ... - Update the set, keeping only elements found in it and *other*. + Update the set, keeping only elements found in it and all others. .. versionchanged:: 2.6 Accepts multiple input iterables.

1 0

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

Aug. 30, 2009

Author: brett.cannon Date: Mon Aug 31 01:41:40 2009 New Revision: 74602 Log: Clarify why test_import is failing under importlib. 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 Mon Aug 31 01:41:40 2009 @@ -6,8 +6,9 @@ this script. XXX FAILING - test_import # execution bit, exception name differing, file name differing - between code and module (?) + test_import + execution bit + file name differing between __file__ and co_filename (r68360 on trunk) """ import importlib

1 0

r74601 - python/branches/py3k/Lib/test/test_import.py
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Mon Aug 31 00:22:21 2009 New Revision: 74601 Log: Loosen an exception test in test_import to not require an explicit message but instead just the proper exception. Modified: python/branches/py3k/Lib/test/test_import.py Modified: python/branches/py3k/Lib/test/test_import.py ============================================================================== --- python/branches/py3k/Lib/test/test_import.py (original) +++ python/branches/py3k/Lib/test/test_import.py Mon Aug 31 00:22:21 2009 @@ -252,8 +252,7 @@ try: __import__(path) except ImportError as err: - self.assertEqual("Import by filename is not supported.", - err.args[0]) + pass else: self.fail("import by path didn't raise an exception")

1 0

r74600 - in python/branches/release26-maint: Doc/library/stdtypes.rst
by georg.brandl Aug. 30, 2009

Aug. 30, 2009

Author: georg.brandl Date: Sun Aug 30 23:06:47 2009 New Revision: 74600 Log: Merged revisions 74590 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74590 | georg.brandl | 2009-08-30 11:51:53 +0000 (So, 30 Aug 2009) | 1 line #6801: fix copy-paste oversight. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Doc/library/stdtypes.rst Modified: python/branches/release26-maint/Doc/library/stdtypes.rst ============================================================================== --- python/branches/release26-maint/Doc/library/stdtypes.rst (original) +++ python/branches/release26-maint/Doc/library/stdtypes.rst Sun Aug 30 23:06:47 2009 @@ -1740,7 +1740,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

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

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 22:22:21 2009 New Revision: 74599 Log: Trying to import a submodule from another module and not a package was raising AttributeError in importlib when it should be an ImportError. Found when running importlib against test_runpy. Modified: python/branches/py3k/Lib/importlib/_bootstrap.py python/branches/py3k/Lib/importlib/test/import_/test_packages.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 22:22:21 2009 @@ -879,7 +879,11 @@ _gcd_import(parent) # Backwards-compatibility; be nicer to skip the dict lookup. parent_module = sys.modules[parent] - path = parent_module.__path__ + try: + path = parent_module.__path__ + except AttributeError: + raise ImportError("no module named {}; " + "{} is not a package".format(name, parent)) meta_path = sys.meta_path + _IMPLICIT_META_PATH for finder in meta_path: loader = finder.find_module(name, path) Modified: python/branches/py3k/Lib/importlib/test/import_/test_packages.py ============================================================================== --- python/branches/py3k/Lib/importlib/test/import_/test_packages.py (original) +++ python/branches/py3k/Lib/importlib/test/import_/test_packages.py Sun Aug 30 22:22:21 2009 @@ -21,6 +21,12 @@ with self.assertRaises(ImportError): import_util.import_('pkg.module') + def test_module_not_package(self): + # Try to import a submodule from a non-package should raise ImportError. + assert not hasattr(sys, '__path__') + with self.assertRaises(ImportError): + import_util.import_('sys.no_submodules_here') + def test_main(): from test.support import run_unittest 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 22:22:21 2009 @@ -8,9 +8,6 @@ XXX FAILING test_import # execution bit, exception name differing, file name differing between code and module (?) - test_runpy # Importing sys.imp.eric raises AttributeError instead of - ImportError (as does any attempt to import a sub-module - from a non-package, e.g. tokenize.menotreal) """ import importlib Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Aug 30 22:22:21 2009 @@ -68,6 +68,9 @@ Library ------- +- Trying to import a submodule from a module that is not a package, ImportError + should be raised, not AttributeError. + - When the globals past to importlib.__import__() has __package__ set to None, fall back to computing what __package__ should be instead of giving up.

1 0

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

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 22:08:15 2009 New Revision: 74598 Log: test_pep3120 is no longer a problem for importlib as the test was tweaked. 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 22:08:15 2009 @@ -8,7 +8,6 @@ XXX FAILING test_import # execution bit, exception name differing, file name differing between code and module (?) - 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 from a non-package, e.g. tokenize.menotreal)

1 0

r74597 - python/branches/py3k/Lib/test/test_pep3120.py
by brett.cannon Aug. 30, 2009

Aug. 30, 2009

Author: brett.cannon Date: Sun Aug 30 22:07:38 2009 New Revision: 74597 Log: Make the exception message check for malformed UTF-8 source looser so that SyntaxError triggered from UnicodeDecodeError is also acceptable. Modified: python/branches/py3k/Lib/test/test_pep3120.py Modified: python/branches/py3k/Lib/test/test_pep3120.py ============================================================================== Binary files. No diff available.

1 0