[Python-checkins] bpo-30688: Import unicodedata only when needed. (GH-5606)

Serhiy Storchaka webhook-mailer at python.org
Sat Feb 10 01:59:33 EST 2018


https://github.com/python/cpython/commit/5df5286abda57a0b3865d4fc3e25aaf1a820ef49
commit: 5df5286abda57a0b3865d4fc3e25aaf1a820ef49
branch: master
author: Zhou Fangyi <fangyi.zhou at yuriko.moe>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2018-02-10T08:59:29+02:00
summary:

bpo-30688: Import unicodedata only when needed. (GH-5606)

Importing unicodedata in sre_parse leads to failure in compilation.
unicodedata is unused during compilation, and is not compiled when this
file is imported. The error occurs when generating posix variables,
pprint is required. The dependency chain goes on like this:

sysconfig -> pprint -> re -> sre_compile -> sre_parse (this file)

This commits fixes compilation issues introduced by
2272cec13b53c405d86c45d404f035f201c0baef.
(Issue 30688, GH-5588)

files:
M Lib/sre_parse.py

diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index db01e844b432..7a172ff2fb14 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -13,7 +13,6 @@
 # XXX: show string offset and offending character for all errors
 
 from sre_constants import *
-import unicodedata
 
 SPECIAL_CHARS = ".\\[{()*+?^$|"
 REPEAT_CHARS = "*+?{"
@@ -324,6 +323,7 @@ def _class_escape(source, escape):
             chr(c) # raise ValueError for invalid code
             return LITERAL, c
         elif c == "N" and source.istext:
+            import unicodedata
             # named unicode escape e.g. \N{EM DASH}
             if not source.match('{'):
                 raise source.error("missing {")
@@ -383,6 +383,7 @@ def _escape(source, escape, state):
             chr(c) # raise ValueError for invalid code
             return LITERAL, c
         elif c == "N" and source.istext:
+            import unicodedata
             # named unicode escape e.g. \N{EM DASH}
             if not source.match('{'):
                 raise source.error("missing {")



More information about the Python-checkins mailing list