Patchwork [STABLE] demandimport: fix TypeError when importing Python regex library (issue4920)

login
register
mail settings
Submitter Gábor Stefanik
Date Oct. 28, 2015, 3:29 p.m.
Message ID <982f4598422555ff712a.1446046180@waste.org>
Download mbox | patch
Permalink /patch/11251/
State Accepted
Headers show

Comments

Gábor Stefanik - Oct. 28, 2015, 3:29 p.m.
# HG changeset patch
# User Gábor Stefanik <gabor.stefanik@nng.com>
# Date 1446046029 -3600
#      Wed Oct 28 16:27:09 2015 +0100
# Branch stable
# Node ID 982f4598422555ff712aa34f8a73d6326ae144aa
# Parent  a9ed5a8fc5e0554d5cb81b7206d2203cc49a2d23
demandimport: fix TypeError when importing Python regex library (issue4920)
Matt Mackall - Oct. 28, 2015, 6:11 p.m.
On Wed, 2015-10-28 at 10:29 -0500, Gábor Stefanik wrote:
> # HG changeset patch
> # User Gábor Stefanik <gabor.stefanik@nng.com>
> # Date 1446046029 -3600
> #      Wed Oct 28 16:27:09 2015 +0100
> # Branch stable
> # Node ID 982f4598422555ff712aa34f8a73d6326ae144aa
> # Parent  a9ed5a8fc5e0554d5cb81b7206d2203cc49a2d23
> demandimport: fix TypeError when importing Python regex library
> (issue4920)

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.

Patch

diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py
--- a/mercurial/demandimport.py
+++ b/mercurial/demandimport.py
@@ -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