From: Ethan Furman <ethan@stoneleaf.us>
Date: Sun, 11 Sep 2016 21:54:27 +0000 (-0700)
Subject: issue28082: better name for Flag
X-Git-Tag: v3.6.0b1~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=722898065c0b1bab196b32f9c1e863195b3aaf9a;p=thirdparty%2FPython%2Fcpython.git

issue28082: better name for Flag
---

diff --git a/Lib/re.py b/Lib/re.py
index ad5964063321..0850f0db8d81 100644
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -138,7 +138,7 @@ __all__ = [
 
 __version__ = "2.2.1"
 
-class Flag(enum.IntFlag):
+class RegexFlag(enum.IntFlag):
     ASCII = sre_compile.SRE_FLAG_ASCII # assume ascii "locale"
     IGNORECASE = sre_compile.SRE_FLAG_IGNORECASE # ignore case
     LOCALE = sre_compile.SRE_FLAG_LOCALE # assume current 8-bit locale
@@ -157,7 +157,7 @@ class Flag(enum.IntFlag):
     TEMPLATE = sre_compile.SRE_FLAG_TEMPLATE # disable backtracking
     T = TEMPLATE
     DEBUG = sre_compile.SRE_FLAG_DEBUG # dump pattern after compilation
-globals().update(Flag.__members__)
+globals().update(RegexFlag.__members__)
 
 # sre exception
 error = sre_compile.error