[Python-checkins] cpython (2.7): Issue #26475: Fixed debugging output for regular expressions with the (?x) flag.

serhiy.storchaka python-checkins at python.org
Sun Mar 6 02:18:05 EST 2016


https://hg.python.org/cpython/rev/b8928725e8cc
changeset:   100420:b8928725e8cc
branch:      2.7
parent:      100418:ea5d01c7997e
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Mar 06 09:15:47 2016 +0200
summary:
  Issue #26475: Fixed debugging output for regular expressions with the (?x) flag.

files:
  Lib/sre_parse.py |  6 +++---
  Misc/NEWS        |  3 +++
  2 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -721,14 +721,14 @@
     elif tail:
         raise error, "bogus characters at end of regular expression"
 
-    if flags & SRE_FLAG_DEBUG:
-        p.dump()
-
     if not (flags & SRE_FLAG_VERBOSE) and p.pattern.flags & SRE_FLAG_VERBOSE:
         # the VERBOSE flag was switched on inside the pattern.  to be
         # on the safe side, we'll parse the whole thing again...
         return parse(str, p.pattern.flags)
 
+    if flags & SRE_FLAG_DEBUG:
+        p.dump()
+
     return p
 
 def parse_template(source, pattern):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -55,6 +55,9 @@
 Library
 -------
 
+- Issue #26475: Fixed debugging output for regular expressions with the (?x)
+  flag.
+
 - Issue #26385: Remove the file if the internal fdopen() call in
   NamedTemporaryFile() fails.  Based on patch by Silent Ghost.
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list