summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-03-06 07:15:47 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-03-06 07:15:47 (GMT)
commita01a144aab05b18b7f4d0e84d04b36b1677338ff (patch)
tree3bdbb563160d1f252b87bbe0003c642d780762d7
parentbe70002866417fec082dbfcf1d4ce97e64eb1e40 (diff)
downloadcpython-a01a144aab05b18b7f4d0e84d04b36b1677338ff.zip
cpython-a01a144aab05b18b7f4d0e84d04b36b1677338ff.tar.gz
cpython-a01a144aab05b18b7f4d0e84d04b36b1677338ff.tar.bz2
Issue #26475: Fixed debugging output for regular expressions with the (?x) flag.
-rw-r--r--Lib/sre_parse.py6
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 3 deletions
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index f6a8851..4ff50d1 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -833,14 +833,14 @@ def parse(str, flags=0, pattern=None):
assert source.next == ")"
raise source.error("unbalanced parenthesis")
- 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
index 8044942..fd9a4d6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,9 @@ Core and Builtins
Library
-------
+- Issue #26475: Fixed debugging output for regular expressions with the (?x)
+ flag.
+
- Issue #26457: Fixed the subnets() methods in IP network classes for the case
when resulting prefix length is equal to maximal prefix length.
Based on patch by Xiang Zhang.