From: Brett Cannon <bcannon@gmail.com>
Date: Tue, 22 Sep 2009 00:32:59 +0000 (+0000)
Subject: Merged revisions 75011 via svnmerge from
X-Git-Tag: v3.2a1~2507
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d12c559ce48941e2c028682184e351f9a07df5a;p=python

Merged revisions 75011 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75011 | brett.cannon | 2009-09-21 17:29:48 -0700 (Mon, 21 Sep 2009) | 10 lines

  When range checking was added to time.strftime() a check was placed on tm_isdst
  to make sure it fell within [-1, 1] just in case someone implementing
  strftime() in libc was stupid enough to assume this. Turns out, though, some
  OSs (e.g. zOS) are stupid enough to use values outside of this range for time
  structs created by the system itself. So instead of throwing a ValueError,
  tm_isdst is now normalized before being passed to strftime().

  Fixes issue #6823. Thanks Robert Shapiro for diagnosing the problem and
  contributing an initial patch.
........
---

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 49a9d17710..4ce90e967a 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -87,11 +87,6 @@ class TimeTestCase(unittest.TestCase):
                             (1900, 1, 1, 0, 0, 0, 0, -1, -1))
         self.assertRaises(ValueError, time.strftime, '',
                             (1900, 1, 1, 0, 0, 0, 0, 367, -1))
-        # Check daylight savings flag [-1, 1]
-        self.assertRaises(ValueError, time.strftime, '',
-                            (1900, 1, 1, 0, 0, 0, 0, 1, -2))
-        self.assertRaises(ValueError, time.strftime, '',
-                            (1900, 1, 1, 0, 0, 0, 0, 1, 2))
 
     def test_default_values_for_zero(self):
         # Make sure that using all zeros uses the proper default values.
diff --git a/Misc/ACKS b/Misc/ACKS
index b2ada2bdca..d419b7e2e6 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -674,6 +674,7 @@ Jerry Seutter
 Denis Severson
 Ian Seyer
 Ha Shao
+Richard Shapiro
 Bruce Sherwood
 Pete Shinners
 Michael Shiplett
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index d8db409570..af0e1a7759 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -512,11 +512,13 @@ time_strftime(PyObject *self, PyObject *args)
             PyErr_SetString(PyExc_ValueError, "day of year out of range");
             return NULL;
         }
-        if (buf.tm_isdst < -1 || buf.tm_isdst > 1) {
-            PyErr_SetString(PyExc_ValueError,
-                            "daylight savings flag out of range");
-            return NULL;
-        }
+	/* Normalize tm_isdst just in case someone foolishly implements %Z
+	   based on the assumption that tm_isdst falls within the range of
+	   [-1, 1] */
+        if (buf.tm_isdst < -1)
+	    buf.tm_isdst = -1;
+	else if (buf.tm_isdst > 1)
+	    buf.tm_isdst = 1;
 
 #ifdef HAVE_WCSFTIME
 	tmpfmt = PyBytes_FromStringAndSize(NULL,