summaryrefslogtreecommitdiff
path: root/pyparsing.py
diff options
context:
space:
mode:
authorPaul McGuire <ptmcg@austin.rr.com>2019-08-20 21:33:59 -0500
committerPaul McGuire <ptmcg@austin.rr.com>2019-08-20 21:33:59 -0500
commit99ea242512c3d625f6f94775afbb9d4642600615 (patch)
tree52ef6638406bb10d526e631ed5e865f8002cbc37 /pyparsing.py
parent072f0ddd3c7907bf061c12a21d352a0f31001508 (diff)
downloadpyparsing-git-99ea242512c3d625f6f94775afbb9d4642600615.tar.gz
Fix minor bug in creating regex range for single character; add unit tests
Diffstat (limited to 'pyparsing.py')
-rw-r--r--pyparsing.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pyparsing.py b/pyparsing.py
index d6c0c34..49b15a8 100644
--- a/pyparsing.py
+++ b/pyparsing.py
@@ -141,6 +141,7 @@ class __config_flags:
dname,
cls._type_desc,
str(getattr(cls, dname)).upper()))
+ return
if dname in cls._all_names:
setattr(cls, dname, value)
else:
@@ -1053,7 +1054,7 @@ class ParseResults(object):
except Exception:
return False
else:
- return not isinstance(obj, (str, bytes))
+ return not isinstance(obj, str_type)
ret = cls([])
for k, v in other.items():
@@ -5312,7 +5313,7 @@ def _collapseAndEscapeRegexRangeChars(s):
for c in chars:
last = c
if first == last:
- ret.append(first)
+ ret.append(escape_re_range_char(first))
else:
ret.append("{}-{}".format(escape_re_range_char(first),
escape_re_range_char(last)))