diff -r 1412be96faf0 Lib/_strptime.py --- a/Lib/_strptime.py Sat Nov 14 15:42:17 2015 +0200 +++ b/Lib/_strptime.py Sat Nov 14 18:23:31 2015 +0200 @@ -77,6 +77,10 @@ class LocaleTime(object): self.__calc_date_time() if _getlang() != self.lang: raise ValueError("locale changed during initialization") + if time.tzname != self.tzname: + raise ValueError("timezone changed during initialization") + if time.daylight != self.daylight: + raise ValueError("daylight changed during initialization") def __pad(self, seq, front): # Add '' to seq to either the front (is True), else the back. @@ -167,9 +171,11 @@ class LocaleTime(object): time.tzset() except AttributeError: pass - no_saving = frozenset({"utc", "gmt", time.tzname[0].lower()}) - if time.daylight: - has_saving = frozenset({time.tzname[1].lower()}) + self.tzname = time.tzname + self.daylight = time.daylight + no_saving = frozenset({"utc", "gmt", self.tzname[0].lower()}) + if self.daylight: + has_saving = frozenset({self.tzname[1].lower()}) else: has_saving = frozenset() self.timezone = (no_saving, has_saving) @@ -327,12 +333,15 @@ def _strptime(data_string, format="%a %b global _TimeRE_cache, _regex_cache with _cache_lock: - if _getlang() != _TimeRE_cache.locale_time.lang: + locale_time = _TimeRE_cache.locale_time + if (_getlang() != locale_time.lang or + time.tzname != locale_time.tzname or + time.daylight != locale_time.daylight): _TimeRE_cache = TimeRE() _regex_cache.clear() + locale_time = _TimeRE_cache.locale_time if len(_regex_cache) > _CACHE_MAX_SIZE: _regex_cache.clear() - locale_time = _TimeRE_cache.locale_time format_regex = _regex_cache.get(format) if not format_regex: try: diff -r 1412be96faf0 Lib/test/test_strptime.py --- a/Lib/test/test_strptime.py Sat Nov 14 15:42:17 2015 +0200 +++ b/Lib/test/test_strptime.py Sat Nov 14 18:23:31 2015 +0200 @@ -4,6 +4,7 @@ import unittest import time import locale import re +import os import sys from test import support from datetime import date as datetime_date @@ -344,9 +345,10 @@ class StrptimeTests(unittest.TestCase): tz_name = time.tzname[0] if tz_name.upper() in ("UTC", "GMT"): self.skipTest('need non-UTC/GMT timezone') - try: - original_tzname = time.tzname - original_daylight = time.daylight + + with support.swap_attr(time, 'tzname', (tz_name, tz_name)), \ + support.swap_attr(time, 'daylight', 1), \ + support.swap_attr(time, 'tzset', lambda: None): time.tzname = (tz_name, tz_name) time.daylight = 1 tz_value = _strptime._strptime_time(tz_name, "%Z")[8] @@ -354,9 +356,6 @@ class StrptimeTests(unittest.TestCase): "%s lead to a timezone value of %s instead of -1 when " "time.daylight set to %s and passing in %s" % (time.tzname, tz_value, time.daylight, tz_name)) - finally: - time.tzname = original_tzname - time.daylight = original_daylight def test_date_time(self): # Test %c directive @@ -608,6 +607,21 @@ class CacheTests(unittest.TestCase): finally: locale.setlocale(locale.LC_TIME, locale_info) + @support.run_with_tz('STD-1DST') + def test_TimeRE_timezone_recreation(self): + # The TimeRE instance should be recreated upon changing the timezone. + _strptime._strptime_time(time.tzname[0], '%Z') + # Get id of current cache object. + first_time_re = _strptime._TimeRE_cache + # Change the timezone and force a recreation of the cache. + os.environ['TZ'] = 'EST+05EDT,M3.2.0,M11.1.0' + time.tzset() + _strptime._strptime_time(time.tzname[0], '%Z') + # Get the new cache object's id. + second_time_re = _strptime._TimeRE_cache + # They should not be equal. + self.assertIsNot(first_time_re, second_time_re) + if __name__ == '__main__': unittest.main()