]> granicus.if.org Git - python/commitdiff
#14796: fix failure of new calendar test on windows.
authorR David Murray <rdmurray@bitdance.com>
Wed, 30 May 2012 12:10:54 +0000 (08:10 -0400)
committerR David Murray <rdmurray@bitdance.com>
Wed, 30 May 2012 12:10:54 +0000 (08:10 -0400)
Lib/test/test_calendar.py

index d00adde7e4302aefe7be8ff71c80f085c7cc838c..e0f63997d5fb5b1779f1d54155e48cadcfffc3f4 100644 (file)
@@ -353,8 +353,9 @@ class OutputTestCase(unittest.TestCase):
 
     def test_yeardatescalendar(self):
         def shrink(cal):
-            return [[[' '.join((d.strftime('%D')
-                    for d in z)) for z in y] for y in x] for x in cal]
+            return [[[' '.join('{:02d}/{:02d}/{}'.format(
+                                d.month, d.day, str(d.year)[-2:]) for d in z)
+                            for z in y] for y in x] for x in cal]
         self.assertEqual(
             shrink(calendar.Calendar().yeardatescalendar(2004)),
             result_2004_dates