From 233ccf289353edb5486304630ebb1755f87738ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20D=C3=B6rwald?= <walter@livinglogic.de>
Date: Tue, 5 Jun 2007 19:50:53 +0000
Subject: Change int_oct() and int_hex() to return unicode objects.
---
Objects/intobject.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/Objects/intobject.c b/Objects/intobject.c
index ab64f79..ad60a49 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -920,27 +920,23 @@ int_float(PyIntObject *v)
static PyObject *
int_oct(PyIntObject *v)
{
- char buf[100];
long x = v -> ob_ival;
if (x < 0)
- PyOS_snprintf(buf, sizeof(buf), "-0%lo", -x);
+ return PyUnicode_FromFormat("-0%lo", -x);
else if (x == 0)
- strcpy(buf, "0");
+ return PyUnicode_FromString("0");
else
- PyOS_snprintf(buf, sizeof(buf), "0%lo", x);
- return PyString_FromString(buf);
+ return PyUnicode_FromFormat("0%lo", x);
}
static PyObject *
int_hex(PyIntObject *v)
{
- char buf[100];
long x = v -> ob_ival;
if (x < 0)
- PyOS_snprintf(buf, sizeof(buf), "-0x%lx", -x);
+ return PyUnicode_FromFormat("-0x%lx", -x);
else
- PyOS_snprintf(buf, sizeof(buf), "0x%lx", x);
- return PyString_FromString(buf);
+ return PyUnicode_FromFormat("0x%lx", x);
}
static PyObject *
--
cgit v0.12