comparison mercurial/demandimport.py @ 28286:c7f89ad87bae

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 29 Feb 2016 17:52:17 -0600
parents 9ff7261cc0f5 f5b2b358b8b7
children fcaf20175b1b
comparison
equal deleted inserted replaced
28284:0fe00bdb2f4f 28286:c7f89ad87bae
233 return mod 233 return mod
234 234
235 ignore = [ 235 ignore = [
236 '__future__', 236 '__future__',
237 '_hashlib', 237 '_hashlib',
238 # ImportError during pkg_resources/__init__.py:fixup_namespace_package
239 '_imp',
238 '_xmlplus', 240 '_xmlplus',
239 'fcntl', 241 'fcntl',
240 'win32com.gen_py', 242 'win32com.gen_py',
241 '_winreg', # 2.7 mimetypes needs immediate ImportError 243 '_winreg', # 2.7 mimetypes needs immediate ImportError
242 'pythoncom', 244 'pythoncom',