[Python-checkins] r74594 - in python/branches/py3k: Lib/importlib/_bootstrap.py Lib/importlib/test/import_/test_api.py Lib/importlib/test/regrtest.py Misc/NEWS
brett.cannon
python-checkins at python.org
Sun Aug 30 21:08:58 CEST 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.
More information about the Python-checkins
mailing list