mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-11 11:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Change int_oct() and int_hex() to return unicode objects.

Browse source
This commit is contained in:
Walter Dörwald 2007-06-05 19:50:53 +00:00
parent 5b0443cf3e
commit 233ccf2893
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Objects/intobject.c
View file

@ -920,27 +920,23 @@ int_float(PyIntObject *v)
static PyObject * static PyObject *
int_oct(PyIntObject *v) int_oct(PyIntObject *v)
{ {
char buf[100];
long x = v -> ob_ival; long x = v -> ob_ival;
if (x < 0) if (x < 0)
PyOS_snprintf(buf, sizeof(buf), "-0%lo", -x); return PyUnicode_FromFormat("-0%lo", -x);
else if (x == 0) else if (x == 0)
strcpy(buf, "0"); return PyUnicode_FromString("0");
else else
PyOS_snprintf(buf, sizeof(buf), "0%lo", x); return PyUnicode_FromFormat("0%lo", x);
return PyString_FromString(buf);
} }
static PyObject * static PyObject *
int_hex(PyIntObject *v) int_hex(PyIntObject *v)
{ {
char buf[100];
long x = v -> ob_ival; long x = v -> ob_ival;
if (x < 0) if (x < 0)
PyOS_snprintf(buf, sizeof(buf), "-0x%lx", -x); return PyUnicode_FromFormat("-0x%lx", -x);
else else
PyOS_snprintf(buf, sizeof(buf), "0x%lx", x); return PyUnicode_FromFormat("0x%lx", x);
return PyString_FromString(buf);
} }
static PyObject * static PyObject *