comparison mercurial/demandimport.py @ 26830:65387a30430e stable

demandimport: fix TypeError when importing Python regex library (issue4920)
author Gábor Stefanik <gabor.stefanik@nng.com>
date Wed, 28 Oct 2015 16:27:09 +0100
parents 7e81305092a0
children 78d05778907b
comparison
equal deleted inserted replaced
26829:58f1645f72c3 26830:65387a30430e
231 'gtk', 231 'gtk',
232 # setuptools' pkg_resources.py expects "from __main__ import x" to 232 # setuptools' pkg_resources.py expects "from __main__ import x" to
233 # raise ImportError if x not defined 233 # raise ImportError if x not defined
234 '__main__', 234 '__main__',
235 '_ssl', # conditional imports in the stdlib, issue1964 235 '_ssl', # conditional imports in the stdlib, issue1964
236 '_sre', # issue4920
236 'rfc822', 237 'rfc822',
237 'mimetools', 238 'mimetools',
238 # setuptools 8 expects this module to explode early when not on windows 239 # setuptools 8 expects this module to explode early when not on windows
239 'distutils.msvc9compiler' 240 'distutils.msvc9compiler'
240 ] 241 ]