diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-03-21 02:12:09 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-03-21 02:12:09 +0100 |
| commit | ee525de6a947c05e8deb44c0675a2bb3e5130497 (patch) | |
| tree | 0df43140bf9de44ae6dd8be9df61b5c4b54ceb39 | |
| parent | 34ad2faf857f7f16d7b69ebc1ba0626f11a3fba3 (diff) | |
| parent | 13ed2ea7a21cf98acb4497aa1edd3202a99682c6 (diff) | |
| download | cpython-git-ee525de6a947c05e8deb44c0675a2bb3e5130497.tar.gz | |
merge
| -rw-r--r-- | Lib/test/test_time.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 7266e27295..2b58093f92 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -295,12 +295,8 @@ class _TestStrftimeYear: 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 |