From: Walter Dörwald Date: Thu, 31 May 2007 16:19:50 +0000 (+0000) Subject: Change format_ctime() to return unicode (i.e. X-Git-Tag: v3.0a1~842 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4af32b3d67bf013b6dcce3b827365d187a0e2973;p=thirdparty%2FPython%2Fcpython.git Change format_ctime() to return unicode (i.e. date.ctime() and datetime.ctime() return unicode now). --- diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c index 4cc941208c59..835af61ec9fd 100644 --- a/Modules/datetimemodule.c +++ b/Modules/datetimemodule.c @@ -1083,14 +1083,12 @@ format_ctime(PyDateTime_Date *date, int hours, int minutes, int seconds) "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - char buffer[128]; int wday = weekday(GET_YEAR(date), GET_MONTH(date), GET_DAY(date)); - PyOS_snprintf(buffer, sizeof(buffer), "%s %s %2d %02d:%02d:%02d %04d", - DayNames[wday], MonthNames[GET_MONTH(date) - 1], - GET_DAY(date), hours, minutes, seconds, - GET_YEAR(date)); - return PyString_FromString(buffer); + return PyUnicode_FromFormat("%s %s %2d %02d:%02d:%02d %04d", + DayNames[wday], MonthNames[GET_MONTH(date)-1], + GET_DAY(date), hours, minutes, seconds, + GET_YEAR(date)); } /* Add an hours & minutes UTC offset string to buf. buf has no more than