diff --git a/tests/test-demandimport.py b/tests/test-demandimport.py --- a/tests/test-demandimport.py +++ b/tests/test-demandimport.py @@ -182,18 +182,19 @@ assert f(re.stderr) == "', mode 'w' at 0x?>", f(re.stderr) assert f(re) == "", f(re) -import contextlib +assert 'telnetlib' not in sys.modules +import telnetlib if ispy3: - assert not isinstance(contextlib, _LazyModule) - assert f(contextlib) == "" + assert not isinstance(telnetlib, _LazyModule) + assert f(telnetlib) == "" else: - assert f(contextlib) == "", f(contextlib) + assert f(telnetlib) == "", f(telnetlib) try: - from contextlib import unknownattr + from telnetlib import unknownattr assert False, ('no demandmod should be created for attribute of non-package ' - 'module:\ncontextlib.unknownattr = %s' % f(unknownattr)) + 'module:\ntelnetlib.unknownattr = %s' % f(unknownattr)) except ImportError as inst: assert rsub(r"'", '', str(inst)).startswith('cannot import name unknownattr') @@ -202,6 +203,7 @@ # Unlike the import statement, __import__() function should not raise # ImportError even if fromlist has an unknown item # (see Python/import.c:import_module_level() and ensure_fromlist()) -contextlibimp = __import__('contextlib', globals(), locals(), ['unknownattr']) -assert f(contextlibimp) == "", f(contextlibimp) -assert not util.safehasattr(contextlibimp, 'unknownattr') +assert 'zipfile' not in sys.modules +zipfileimp = __import__('zipfile', globals(), locals(), ['unknownattr']) +assert f(zipfileimp) == "", f(zipfileimp) +assert not util.safehasattr(zipfileimp, 'unknownattr')