From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 21 Mar 2011 01:11:01 +0000 (+0100)
Subject: Issue #10864 has been fixed: remove the workaround
X-Git-Tag: v3.2.1b1~244
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13ed2ea7a21cf98acb4497aa1edd3202a99682c6;p=python

Issue #10864 has been fixed: remove the workaround
---

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