Mercurial > hg-stable
changeset 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 | 58f1645f72c3 |
children | 0a7610758c42 |
files | mercurial/demandimport.py |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/demandimport.py Sat Oct 24 00:39:22 2015 +0100 +++ b/mercurial/demandimport.py Wed Oct 28 16:27:09 2015 +0100 @@ -233,6 +233,7 @@ # raise ImportError if x not defined '__main__', '_ssl', # conditional imports in the stdlib, issue1964 + '_sre', # issue4920 'rfc822', 'mimetools', # setuptools 8 expects this module to explode early when not on windows