diff -r 7a8ea1397816 -r d718eddf01d9 tests/test-demandimport.py --- a/tests/test-demandimport.py Thu Dec 08 15:33:19 2022 +0100 +++ b/tests/test-demandimport.py Thu Aug 31 23:56:15 2023 +0200 @@ -179,15 +179,13 @@ 'cannot import name unknownattr' ) -from mercurial import util - # 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()) assert 'ftplib' not in sys.modules zipfileimp = __import__('ftplib', globals(), locals(), ['unknownattr']) assert f(zipfileimp) == "", f(zipfileimp) -assert not util.safehasattr(zipfileimp, 'unknownattr') +assert not hasattr(zipfileimp, 'unknownattr') # test deactivation for issue6725