diff options
author | Fredrik Lundh <fredrik@pythonware.com> | 2001-10-22 06:01:56 (GMT) |
---|---|---|
committer | Fredrik Lundh <fredrik@pythonware.com> | 2001-10-22 06:01:56 (GMT) |
commit | f864aa8fd9afc1410dd7dc4d147c3bd8b7d5342a (patch) | |
tree | 95b14e0eaf17181939bc88f9d0d4d529ba560736 | |
parent | 5c66a26dee41853a9ce43b75965cc16b8e34aef0 (diff) | |
download | cpython-f864aa8fd9afc1410dd7dc4d147c3bd8b7d5342a.zip cpython-f864aa8fd9afc1410dd7dc4d147c3bd8b7d5342a.tar.gz cpython-f864aa8fd9afc1410dd7dc4d147c3bd8b7d5342a.tar.bz2 |
sre.split should return the last segment, even if empty
(sorry, barry)
-rw-r--r-- | Lib/test/test_sre.py | 1 | ||||
-rw-r--r-- | Modules/_sre.c | 21 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Lib/test/test_sre.py b/Lib/test/test_sre.py index e879151..75a168c 100644 --- a/Lib/test/test_sre.py +++ b/Lib/test/test_sre.py @@ -155,6 +155,7 @@ if verbose: print 'Running tests on sre.split' test(r"""sre.split(r":", ":a:b::c")""", ['', 'a', 'b', '', 'c']) +test(r"""sre.split(r":+", ":a:b:::")""", ['', 'a', 'b', '']) test(r"""sre.split(r":*", ":a:b::c")""", ['', 'a', 'b', 'c']) test(r"""sre.split(r"(:*)", ":a:b::c")""", ['', ':', 'a', ':', 'b', '::', 'c']) test(r"""sre.split(r"(?::*)", ":a:b::c")""", ['', 'a', 'b', 'c']) diff --git a/Modules/_sre.c b/Modules/_sre.c index 5573046..73ffa70 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -2007,17 +2007,16 @@ pattern_split(PatternObject* self, PyObject* args, PyObject* kw) } - /* get segment following last match */ - i = STATE_OFFSET(&state, last); - if (i < state.endpos) { - item = PySequence_GetSlice(string, i, state.endpos); - if (!item) - goto error; - status = PyList_Append(list, item); - Py_DECREF(item); - if (status < 0) - goto error; - } + /* get segment following last match (even if empty) */ + item = PySequence_GetSlice( + string, STATE_OFFSET(&state, last), state.endpos + ); + if (!item) + goto error; + status = PyList_Append(list, item); + Py_DECREF(item); + if (status < 0) + goto error; state_fini(&state); return list; |