From af13023380fe28e2a52f566ea3c8f070fb92f14d Mon Sep 17 00:00:00 2001 From: Paul McGuire Date: Sat, 20 Jun 2020 09:00:04 -0500 Subject: strRepr cleanup, remove replicated __str__ methods --- pyparsing/util.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pyparsing/util.py') diff --git a/pyparsing/util.py b/pyparsing/util.py index 0d5af76..ce68d38 100644 --- a/pyparsing/util.py +++ b/pyparsing/util.py @@ -134,7 +134,7 @@ def _escapeRegexRangeChars(s): return str(s) -def _collapseAndEscapeRegexRangeChars(s): +def _collapseStringToRanges(s, re_escape=True): def is_consecutive(c): c_int = ord(c) is_consecutive.prev, prev = c_int, is_consecutive.prev @@ -149,6 +149,9 @@ def _collapseAndEscapeRegexRangeChars(s): def escape_re_range_char(c): return "\\" + c if c in r"\^-][" else c + if not re_escape: + escape_re_range_char = lambda c: c + ret = [] for _, chars in itertools.groupby(sorted(s), key=is_consecutive): first = last = next(chars) -- cgit v1.2.1