mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

When the globals argument to importlib.__import__() contained any value for

Browse source 
__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.
This commit is contained in:
Brett Cannon 2009-08-30 19:53:48 +00:00
parent ce7d4cbc3b
commit de4ebfe559
3 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/importlib/test/import_/test___package__.py
View file

@ -19,8 +19,9 @@ class Using__package__(unittest.TestCase):
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 @@ class Using__package__(unittest.TestCase):
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):