Author: Philip Jenvey <[email protected]>
Branch:
Changeset: r64927:e0ba4acfd3c2
Date: 2013-06-17 14:02 -0700
http://bitbucket.org/pypy/pypy/changeset/e0ba4acfd3c2/
Log: adapt to the new methods (fix translation)
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
@@ -12,8 +12,8 @@
from pypy.module.cpyext.stringobject import PyString_Check
from pypy.module.sys.interp_encoding import setdefaultencoding
from pypy.module._codecs.interp_codecs import CodecState
-from pypy.objspace.std import unicodeobject, unicodetype, stringtype
-from rpython.rlib import runicode
+from pypy.objspace.std import unicodeobject, unicodetype
+from rpython.rlib import rstring, runicode
from rpython.tool.sourcetools import func_renamer
import sys
@@ -684,9 +684,9 @@
str = space.unicode_w(w_str)
substr = space.unicode_w(w_substr)
if rffi.cast(lltype.Signed, direction) <= 0:
- return stringtype.stringstartswith(str, substr, start, end)
+ return rstring.startswith(str, substr, start, end)
else:
- return stringtype.stringendswith(str, substr, start, end)
+ return rstring.endswith(str, substr, start, end)
@cpython_api([PyObject, PyObject, Py_ssize_t, Py_ssize_t], Py_ssize_t,
error=-1)
def PyUnicode_Count(space, w_str, w_substr, start, end):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
