From 1ab833082738ced53318aca05901e596d5ede683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Walter=20D=C3=B6rwald?= Date: Fri, 18 May 2007 17:15:44 +0000 Subject: Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror PyString_Concat() and PyString_ConcatAndDel() (the name PyUnicode_Concat() was already taken). Change PyObject_Repr() to always return a unicode object. Update all repr implementations to return unicode objects. Add a function PyObject_ReprStr8() that calls PyObject_Repr() and converts the result to an 8bit string. Use PyObject_ReprStr8() where using PyObject_Repr() can't be done straightforward. --- Objects/rangeobject.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Objects/rangeobject.c') diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 8d71a90868..c5355dfb0b 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -261,19 +261,19 @@ range_repr(rangeobject *r) } if (istart == 0 && istep == 1) - result = PyString_FromFormat("range(%s)", - PyString_AS_STRING(stop_str)); + result = PyUnicode_FromFormat("range(%s)", + PyString_AS_STRING(stop_str)); else if (istep == 1) { if (start_str) - result = PyString_FromFormat("range(%s, %s)", - PyString_AS_STRING(start_str), - PyString_AS_STRING(stop_str)); + result = PyUnicode_FromFormat("range(%s, %s)", + PyString_AS_STRING(start_str), + PyString_AS_STRING(stop_str)); } else if (start_str && step_str) - result = PyString_FromFormat("range(%s, %s, %s)", - PyString_AS_STRING(start_str), - PyString_AS_STRING(stop_str), - PyString_AS_STRING(step_str)); + result = PyUnicode_FromFormat("range(%s, %s, %s)", + PyString_AS_STRING(start_str), + PyString_AS_STRING(stop_str), + PyString_AS_STRING(step_str)); /* else result is NULL and an error should already be set. */ Py_XDECREF(start_str); -- cgit v1.2.1