diff options
author | Brett Cannon <brett@python.org> | 2012-02-23 23:29:12 (GMT) |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2012-02-23 23:29:12 (GMT) |
commit | f500778f652f6beb368f10c0fd312c3034dfce5e (patch) | |
tree | 4d1f19d90085c9d1494cc6eb9d973324913734f6 | |
parent | 068915cc8b75720192be0e5834e7e25993fae5ff (diff) | |
download | cpython-f500778f652f6beb368f10c0fd312c3034dfce5e.zip cpython-f500778f652f6beb368f10c0fd312c3034dfce5e.tar.gz cpython-f500778f652f6beb368f10c0fd312c3034dfce5e.tar.bz2 |
Improper type for __package__ should raise TypeError, not ValueError.
-rw-r--r-- | Lib/importlib/_bootstrap.py | 2 | ||||
-rw-r--r-- | Lib/importlib/test/import_/test___package__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index 6382079..ccdea85 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -926,7 +926,7 @@ def _sanity_check(name, package, level): raise ValueError('level must be >= 0') if package: if not isinstance(package, str): - raise ValueError("__package__ not set to a string") + raise TypeError("__package__ not set to a string") elif package not in sys.modules: msg = ("Parent module {0!r} not loaded, cannot perform relative " "import") diff --git a/Lib/importlib/test/import_/test___package__.py b/Lib/importlib/test/import_/test___package__.py index 5056ae5..783cde1 100644 --- a/Lib/importlib/test/import_/test___package__.py +++ b/Lib/importlib/test/import_/test___package__.py @@ -67,7 +67,7 @@ class Using__package__(unittest.TestCase): def test_bunk__package__(self): globals = {'__package__': 42} - with self.assertRaises(ValueError): + with self.assertRaises(TypeError): import_util.import_('', globals, {}, ['relimport'], 1) |