# HG changeset patch # User Gábor Stefanik # Date 1446046029 -3600 # Node ID 65387a30430e8c0d2cf4851cdb2057d5b05e1cc8 # Parent 58f1645f72c3cd48191e1b8da412a5ddf31541c1 demandimport: fix TypeError when importing Python regex library (issue4920) diff -r 58f1645f72c3 -r 65387a30430e mercurial/demandimport.py --- 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