[pypy-commit] pypy default: PyUnicode_Split(): support NULL for the separator.
amauryfa
noreply at buildbot.pypy.org
Wed Apr 11 20:42:36 CEST 2012
Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch:
Changeset: r54289:ad03b1c52876
Date: 2012-04-11 20:41 +0200
http://bitbucket.org/pypy/pypy/changeset/ad03b1c52876/
Log: PyUnicode_Split(): support NULL for the separator.
diff --git a/pypy/module/cpyext/test/test_unicodeobject.py b/pypy/module/cpyext/test/test_unicodeobject.py
--- a/pypy/module/cpyext/test/test_unicodeobject.py
+++ b/pypy/module/cpyext/test/test_unicodeobject.py
@@ -479,6 +479,8 @@
api.PyUnicode_Split(w_str, space.wrap('\n'), -1)))
assert r"[u'a', u'b', u'c\nd']" == space.unwrap(space.repr(
api.PyUnicode_Split(w_str, space.wrap('\n'), 2)))
+ assert r"[u'a', u'b', u'c d']" == space.unwrap(space.repr(
+ api.PyUnicode_Split(space.wrap(u'a\nb c d'), None, 2)))
assert "[u'a', u'b', u'c', u'd']" == space.unwrap(space.repr(
api.PyUnicode_Splitlines(w_str, 0)))
assert r"[u'a\n', u'b\n', u'c\n', u'd']" == space.unwrap(space.repr(
diff --git a/pypy/module/cpyext/unicodeobject.py b/pypy/module/cpyext/unicodeobject.py
--- a/pypy/module/cpyext/unicodeobject.py
+++ b/pypy/module/cpyext/unicodeobject.py
@@ -630,6 +630,8 @@
Otherwise, splits occur at the given separator. At most maxsplit
splits will be done. If negative, no limit is set. Separators
are not included in the resulting list."""
+ if w_sep is None:
+ w_sep = space.w_None
return space.call_method(w_str, "split", w_sep, space.wrap(maxsplit))
@cpython_api([PyObject, rffi.INT_real], PyObject)
More information about the pypy-commit
mailing list