From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 30 May 2012 12:10:54 +0000 (-0400)
Subject: #14796: fix failure of new calendar test on windows.
X-Git-Tag: v3.3.0a4~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb7567800318888bb60926686d90f3e2d942a20f;p=python

#14796: fix failure of new calendar test on windows.
---

diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
index d00adde7e4..e0f63997d5 100644
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -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