summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2003-06-27 08:14:17 (GMT)
committerRaymond Hettinger <python@rcn.com>2003-06-27 08:14:17 (GMT)
commitf69d9f6818225fc2613230c5dc11c181085db383 (patch)
tree41adffd0bafe34bcfa52f4f8f09b088fc7c3e38f /Lib
parentdf9eff061e67ead5af3433c34b5f58451bc201a0 (diff)
downloadcpython-f69d9f6818225fc2613230c5dc11c181085db383.zip
cpython-f69d9f6818225fc2613230c5dc11c181085db383.tar.gz
cpython-f69d9f6818225fc2613230c5dc11c181085db383.tar.bz2
SF bug #761337: datetime.strftime fails on trivial format string
The interning of short strings violates the refcnt==1 assumption for _PyString_Resize(). A simple fix is to boost the initial value of "totalnew" by 1. Combined with an NULL argument to PyString_FromStringAndSize(), this assures that resulting format string is not interned. This will remain true even if the implementation of PyString_FromStringAndSize() changes because only the uninitialized strings that can be interned are those of zero length. Added a test case.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_datetime.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py
index cca0c9d..c6dbb48 100644
--- a/Lib/test/test_datetime.py
+++ b/Lib/test/test_datetime.py
@@ -831,6 +831,7 @@ class TestDate(HarmlessMixedComparison):
def test_strftime(self):
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.assertRaises(TypeError, t.strftime) # needs an arg
self.assertRaises(TypeError, t.strftime, "one", "two") # too many args