[Python-checkins] cpython (merge 3.2 -> default): merge (original) (raw)
victor.stinner python-checkins at python.org
Mon Mar 21 02:12:19 CET 2011
- Previous message: [Python-checkins] cpython (3.2): Issue #10864 has been fixed: remove the workaround
- Next message: [Python-checkins] cpython (3.2): time.strftime(): replace PyErr_Format() by PyErr_SetString()
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
http://hg.python.org/cpython/rev/cbd86ac6cc81 changeset: 68782:cbd86ac6cc81 parent: 68780:c0829c4e19cf parent: 68781:d56eb817b181 user: Victor Stinner <victor.stinner at haypocalc.com> date: Mon Mar 21 02:12:09 2011 +0100 summary: merge
files:
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -295,12 +295,8 @@ except ValueError: # strftime() is limited to [1; 9999] with Visual Studio return
# Issue #10864: OpenIndiana is limited to 4 digits,# but Python doesn't raise a ValueError#self.assertEqual(text, '12345')#self.assertEqual(self.yearstr(123456789), '123456789')self.assertIn(text, ('2345', '12345'))self.assertIn(self.yearstr(123456789), ('123456789', '6789'))
self.assertEqual(text, '12345')self.assertEqual(self.yearstr(123456789), '123456789')
class _Test2dYear(_BaseYearTest): accept2dyear = 1
-- Repository URL: http://hg.python.org/cpython
- Previous message: [Python-checkins] cpython (3.2): Issue #10864 has been fixed: remove the workaround
- Next message: [Python-checkins] cpython (3.2): time.strftime(): replace PyErr_Format() by PyErr_SetString()
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]