# HG changeset patch # User Gábor Stefanik # Date 2015-10-28 15:27:09 # Node ID 65387a30430e8c0d2cf4851cdb2057d5b05e1cc8 # Parent 58f1645f72c3cd48191e1b8da412a5ddf31541c1 demandimport: fix TypeError when importing Python regex library (issue4920) diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py --- a/mercurial/demandimport.py +++ b/mercurial/demandimport.py @@ -233,6 +233,7 @@ ignore = [ # 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