[Python-checkins] cpython (3.4): Fixed compile error in issue #22410. The _locale module is optional.

Fri Oct 31 00:39:45 CET 2014

https://hg.python.org/cpython/rev/0c016fa378db
changeset: 93297:0c016fa378db
branch: 3.4
parent: 93294:70d635f457e6
user: Serhiy Storchaka <storchaka at gmail.com>
date: Fri Oct 31 01:34:45 2014 +0200
summary:
 Fixed compile error in issue #22410. The _locale module is optional.
files:
 Lib/re.py | 7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Lib/re.py b/Lib/re.py
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -122,7 +122,10 @@
 import sys
 import sre_compile
 import sre_parse
-import _locale
+try:
+ import _locale
+except ImportError:
+ _locale = None
 
 # public symbols
 __all__ = [ "match", "fullmatch", "search", "sub", "subn", "split", "findall",
@@ -293,6 +296,8 @@
 if len(_cache) >= _MAXCACHE:
 _cache.clear()
 if p.flags & LOCALE:
+ if not _locale:
+ return p
 loc = _locale.setlocale(_locale.LC_CTYPE)
 else:
 loc = None
-- 
Repository URL: https://hg.python.org/cpython
