From 6d7c36332f3ad9a2214ef9531ea0d5dc0cb9c765 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 30 Sep 2006 11:17:43 +0000 Subject: [PATCH] Bug #1556784: allow format strings longer than 127 characters in datetime's strftime function. (backport from rev. 52072) --- Lib/test/test_datetime.py | 1 + Misc/NEWS | 3 +++ Modules/datetimemodule.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index 203bea15004..436cfcad750 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -844,6 +844,7 @@ class TestDate(HarmlessMixedComparison): t = self.theclass(2005, 3, 2) self.assertEqual(t.strftime("m:%m d:%d y:%y"), "m:03 d:02 y:05") self.assertEqual(t.strftime(""), "") # SF bug #761337 + self.assertEqual(t.strftime('x'*1000), 'x'*1000) # SF bug #1556784 self.assertRaises(TypeError, t.strftime) # needs an arg self.assertRaises(TypeError, t.strftime, "one", "two") # too many args diff --git a/Misc/NEWS b/Misc/NEWS index e8a3b088e21..55ef60ff973 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -35,6 +35,9 @@ Core and builtins Extension Modules ----------------- +- Bug #1556784: allow format strings longer than 127 characters in + datetime's strftime function. + - Fix itertools.count(n) to work with negative numbers again. diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c index 648ebe5af34..39a859f3e5d 100644 --- a/Modules/datetimemodule.c +++ b/Modules/datetimemodule.c @@ -1149,9 +1149,9 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, PyObject *newfmt = NULL; /* py string, the output format */ char *pnew; /* pointer to available byte in output format */ - char totalnew; /* number bytes total in output format buffer, + int totalnew; /* number bytes total in output format buffer, exclusive of trailing \0 */ - char usednew; /* number bytes used so far in output format buffer */ + int usednew; /* number bytes used so far in output format buffer */ char *ptoappend; /* pointer to string to append to output buffer */ int ntoappend; /* # of bytes to append to output buffer */