From 41c56940c6edf3ea169332a6b039b6c8796f0475 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 26 Oct 2017 10:41:59 +0300 Subject: bpo-21720: Restore the Python 2.7 logic in handling a fromlist. (#4118) BytesWarning no longer emitted when the fromlist argument of __import__() or the __all__ attribute of the module contain bytes instances. --- Lib/importlib/_bootstrap.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'Lib/importlib/_bootstrap.py') diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index 76e1be5968..5df6aa040a 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -994,7 +994,7 @@ def _gcd_import(name, package=None, level=0): return _find_and_load(name, _gcd_import) -def _handle_fromlist(module, fromlist, import_): +def _handle_fromlist(module, fromlist, import_, *, recursive=False): """Figure out what __import__ should return. The import_ parameter is a callable which takes the name of module to @@ -1005,13 +1005,19 @@ def _handle_fromlist(module, fromlist, import_): # The hell that is fromlist ... # If a package was imported, try to import stuff from fromlist. if hasattr(module, '__path__'): - if '*' in fromlist: - fromlist = list(fromlist) - fromlist.remove('*') - if hasattr(module, '__all__'): - fromlist.extend(module.__all__) for x in fromlist: - if not hasattr(module, x): + if not isinstance(x, str): + if recursive: + where = module.__name__ + '.__all__' + else: + where = "``from list''" + raise TypeError(f"Item in {where} must be str, " + f"not {type(x).__name__}") + elif x == '*': + if not recursive and hasattr(module, '__all__'): + _handle_fromlist(module, module.__all__, import_, + recursive=True) + elif not hasattr(module, x): from_name = '{}.{}'.format(module.__name__, x) try: _call_with_frames_removed(import_, from_name) -- cgit v1.2.1