annotate Lib/test/test_strptime.py @ 54294:dba767bc3155 legacy-trunk

remove mention of old ctypes version
author Benjamin Peterson <benjamin@python.org>
date Sat, 23 May 2009 20:59:09 +0000
parents 212e9c8ad087
children e26ee8ddd29d 6768b2350c57
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25372
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
1 """PyUnit testing against strptime"""
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
2
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
3 import unittest
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
4 import time
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
5 import locale
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
6 import re
30117
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
7 import sys
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
8 from test import test_support
33784
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
9 from datetime import date as datetime_date
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
10
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
11 import _strptime
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
12
29991
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
13 class getlang_Tests(unittest.TestCase):
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
14 """Test _getlang"""
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
15 def test_basic(self):
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
16 self.failUnlessEqual(_strptime._getlang(), locale.getlocale(locale.LC_TIME))
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
17
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
18 class LocaleTime_Tests(unittest.TestCase):
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
19 """Tests for _strptime.LocaleTime.
30929
54ff68e973ee * Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents: 30228
diff changeset
20
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
21 All values are lower-cased when stored in LocaleTime, so make sure to
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
22 compare values after running ``lower`` on them.
30929
54ff68e973ee * Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents: 30228
diff changeset
23
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
24 """
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
25
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
26 def setUp(self):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
27 """Create time tuple based on current time."""
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
28 self.time_tuple = time.localtime()
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
29 self.LT_ins = _strptime.LocaleTime()
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
30
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
31 def compare_against_time(self, testing, directive, tuple_position,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
32 error_msg):
24674
3269bdd65988 Whitespace normalization.
Tim Peters <tim.peters@gmail.com>
parents: 24322
diff changeset
33 """Helper method that tests testing against directive based on the
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
34 tuple_position of time_tuple. Uses error_msg as error message.
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
35
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
36 """
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
37 strftime_output = time.strftime(directive, self.time_tuple).lower()
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
38 comparison = testing[self.time_tuple[tuple_position]]
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
39 self.failUnless(strftime_output in testing, "%s: not found in tuple" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
40 error_msg)
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
41 self.failUnless(comparison == strftime_output,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
42 "%s: position within tuple incorrect; %s != %s" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
43 (error_msg, comparison, strftime_output))
24674
3269bdd65988 Whitespace normalization.
Tim Peters <tim.peters@gmail.com>
parents: 24322
diff changeset
44
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
45 def test_weekday(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
46 # Make sure that full and abbreviated weekday names are correct in
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
47 # both string and position with tuple
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
48 self.compare_against_time(self.LT_ins.f_weekday, '%A', 6,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
49 "Testing of full weekday name failed")
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
50 self.compare_against_time(self.LT_ins.a_weekday, '%a', 6,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
51 "Testing of abbreviated weekday name failed")
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
52
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
53 def test_month(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
54 # Test full and abbreviated month names; both string and position
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
55 # within the tuple
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
56 self.compare_against_time(self.LT_ins.f_month, '%B', 1,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
57 "Testing against full month name failed")
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
58 self.compare_against_time(self.LT_ins.a_month, '%b', 1,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
59 "Testing against abbreviated month name failed")
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
60
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
61 def test_am_pm(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
62 # Make sure AM/PM representation done properly
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
63 strftime_output = time.strftime("%p", self.time_tuple).lower()
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
64 self.failUnless(strftime_output in self.LT_ins.am_pm,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
65 "AM/PM representation not in tuple")
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
66 if self.time_tuple[3] < 12: position = 0
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
67 else: position = 1
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
68 self.failUnless(strftime_output == self.LT_ins.am_pm[position],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
69 "AM/PM representation in the wrong position within the tuple")
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
70
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
71 def test_timezone(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
72 # Make sure timezone is correct
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
73 timezone = time.strftime("%Z", self.time_tuple).lower()
29073
c4e8c6721e45 Beefed up timezone support. UTC and GMT are now always recognized timezones
Brett Cannon <bcannon@gmail.com>
parents: 28917
diff changeset
74 if timezone:
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
75 self.failUnless(timezone in self.LT_ins.timezone[0] or \
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
76 timezone in self.LT_ins.timezone[1],
29073
c4e8c6721e45 Beefed up timezone support. UTC and GMT are now always recognized timezones
Brett Cannon <bcannon@gmail.com>
parents: 28917
diff changeset
77 "timezone %s not found in %s" %
c4e8c6721e45 Beefed up timezone support. UTC and GMT are now always recognized timezones
Brett Cannon <bcannon@gmail.com>
parents: 28917
diff changeset
78 (timezone, self.LT_ins.timezone))
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
79
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
80 def test_date_time(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
81 # Check that LC_date_time, LC_date, and LC_time are correct
25372
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
82 # the magic date is used so as to not have issues with %c when day of
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
83 # the month is a single digit and has a leading space. This is not an
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
84 # issue since strptime still parses it correctly. The problem is
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
85 # testing these directives for correctness by comparing strftime
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
86 # output.
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
87 magic_date = (1999, 3, 17, 22, 44, 55, 2, 76, 0)
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
88 strftime_output = time.strftime("%c", magic_date)
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
89 self.failUnless(strftime_output == time.strftime(self.LT_ins.LC_date_time,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
90 magic_date),
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
91 "LC_date_time incorrect")
25372
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
92 strftime_output = time.strftime("%x", magic_date)
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
93 self.failUnless(strftime_output == time.strftime(self.LT_ins.LC_date,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
94 magic_date),
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
95 "LC_date incorrect")
25372
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
96 strftime_output = time.strftime("%X", magic_date)
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
97 self.failUnless(strftime_output == time.strftime(self.LT_ins.LC_time,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
98 magic_date),
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
99 "LC_time incorrect")
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
100 LT = _strptime.LocaleTime()
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
101 LT.am_pm = ('', '')
25372
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
102 self.failUnless(LT.LC_time, "LocaleTime's LC directives cannot handle "
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
103 "empty strings")
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
104
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
105 def test_lang(self):
29991
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
106 # Make sure lang is set to what _getlang() returns
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
107 # Assuming locale has not changed between now and when self.LT_ins was created
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
108 self.failUnlessEqual(self.LT_ins.lang, _strptime._getlang())
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
109
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
110
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
111 class TimeRETests(unittest.TestCase):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
112 """Tests for TimeRE."""
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
113
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
114 def setUp(self):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
115 """Construct generic TimeRE object."""
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
116 self.time_re = _strptime.TimeRE()
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
117 self.locale_time = _strptime.LocaleTime()
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
118
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
119 def test_pattern(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
120 # Test TimeRE.pattern
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
121 pattern_string = self.time_re.pattern(r"%a %A %d")
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
122 self.failUnless(pattern_string.find(self.locale_time.a_weekday[2]) != -1,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
123 "did not find abbreviated weekday in pattern string '%s'" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
124 pattern_string)
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
125 self.failUnless(pattern_string.find(self.locale_time.f_weekday[4]) != -1,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
126 "did not find full weekday in pattern string '%s'" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
127 pattern_string)
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
128 self.failUnless(pattern_string.find(self.time_re['d']) != -1,
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
129 "did not find 'd' directive pattern string '%s'" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
130 pattern_string)
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
131
28686
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
132 def test_pattern_escaping(self):
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
133 # Make sure any characters in the format string that might be taken as
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
134 # regex syntax is escaped.
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
135 pattern_string = self.time_re.pattern("\d+")
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
136 self.failUnless(r"\\d\+" in pattern_string,
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
137 "%s does not have re characters escaped properly" %
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
138 pattern_string)
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
139
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
140 def test_compile(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
141 # Check that compiled regex is correct
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
142 found = self.time_re.compile(r"%A").match(self.locale_time.f_weekday[6])
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
143 self.failUnless(found and found.group('A') == self.locale_time.f_weekday[6],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
144 "re object for '%A' failed")
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
145 compiled = self.time_re.compile(r"%a %b")
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
146 found = compiled.match("%s %s" % (self.locale_time.a_weekday[4],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
147 self.locale_time.a_month[4]))
24674
3269bdd65988 Whitespace normalization.
Tim Peters <tim.peters@gmail.com>
parents: 24322
diff changeset
148 self.failUnless(found,
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
149 "Match failed with '%s' regex and '%s' string" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
150 (compiled.pattern, "%s %s" % (self.locale_time.a_weekday[4],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
151 self.locale_time.a_month[4])))
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
152 self.failUnless(found.group('a') == self.locale_time.a_weekday[4] and
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
153 found.group('b') == self.locale_time.a_month[4],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
154 "re object couldn't find the abbreviated weekday month in "
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
155 "'%s' using '%s'; group 'a' = '%s', group 'b' = %s'" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
156 (found.string, found.re.pattern, found.group('a'),
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
157 found.group('b')))
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
158 for directive in ('a','A','b','B','c','d','H','I','j','m','M','p','S',
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
159 'U','w','W','x','X','y','Y','Z','%'):
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
160 compiled = self.time_re.compile("%" + directive)
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
161 found = compiled.match(time.strftime("%" + directive))
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
162 self.failUnless(found, "Matching failed on '%s' using '%s' regex" %
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
163 (time.strftime("%" + directive),
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
164 compiled.pattern))
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
165
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
166 def test_blankpattern(self):
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
167 # Make sure when tuple or something has no values no regex is generated.
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
168 # Fixes bug #661354
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
169 test_locale = _strptime.LocaleTime()
30929
54ff68e973ee * Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents: 30228
diff changeset
170 test_locale.timezone = (frozenset(), frozenset())
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
171 self.failUnless(_strptime.TimeRE(test_locale).pattern("%Z") == '',
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
172 "with timezone == ('',''), TimeRE().pattern('%Z') != ''")
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
173
28686
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
174 def test_matching_with_escapes(self):
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
175 # Make sure a format that requires escaping of characters works
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
176 compiled_re = self.time_re.compile("\w+ %m")
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
177 found = compiled_re.match("\w+ 10")
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
178 self.failUnless(found, "Escaping failed of format '\w+ 10'")
70d6f8b0fc69 Make _strptime escape regex syntax in format string to prevent use in internal regex.
Brett Cannon <bcannon@gmail.com>
parents: 28243
diff changeset
179
33674
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
180 def test_locale_data_w_regex_metacharacters(self):
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
181 # Check that if locale data contains regex metacharacters they are
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
182 # escaped properly.
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
183 # Discovered by bug #1039270 .
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
184 locale_time = _strptime.LocaleTime()
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
185 locale_time.timezone = (frozenset(("utc", "gmt",
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
186 "Tokyo (standard time)")),
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
187 frozenset("Tokyo (daylight time)"))
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
188 time_re = _strptime.TimeRE(locale_time)
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
189 self.failUnless(time_re.compile("%Z").match("Tokyo (standard time)"),
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
190 "locale data that contains regex metacharacters is not"
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
191 " properly escaped")
d99de65f5425 Locale data that contains regex metacharacters are now properly escaped.
Brett Cannon <bcannon@gmail.com>
parents: 32651
diff changeset
192
41938
e19972834170 Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
Brett Cannon <bcannon@gmail.com>
parents: 41350
diff changeset
193 def test_whitespace_substitution(self):
e19972834170 Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
Brett Cannon <bcannon@gmail.com>
parents: 41350
diff changeset
194 # When pattern contains whitespace, make sure it is taken into account
e19972834170 Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
Brett Cannon <bcannon@gmail.com>
parents: 41350
diff changeset
195 # so as to not allow to subpatterns to end up next to each other and
e19972834170 Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
Brett Cannon <bcannon@gmail.com>
parents: 41350
diff changeset
196 # "steal" characters from each other.
e19972834170 Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
Brett Cannon <bcannon@gmail.com>
parents: 41350
diff changeset
197 pattern = self.time_re.pattern('%j %H')
e19972834170 Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
Brett Cannon <bcannon@gmail.com>
parents: 41350
diff changeset
198 self.failUnless(not re.match(pattern, "180"))
e19972834170 Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
Brett Cannon <bcannon@gmail.com>
parents: 41350
diff changeset
199 self.failUnless(re.match(pattern, "18 0"))
e19972834170 Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
Brett Cannon <bcannon@gmail.com>
parents: 41350
diff changeset
200
e19972834170 Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
Brett Cannon <bcannon@gmail.com>
parents: 41350
diff changeset
201
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
202 class StrptimeTests(unittest.TestCase):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
203 """Tests for _strptime.strptime."""
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
204
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
205 def setUp(self):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
206 """Create testing time tuple."""
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
207 self.time_tuple = time.gmtime()
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
208
35830
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
209 def test_ValueError(self):
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
210 # Make sure ValueError is raised when match fails or format is bad
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
211 self.assertRaises(ValueError, _strptime._strptime_time, data_string="%d",
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
212 format="%A")
35830
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
213 for bad_format in ("%", "% ", "%e"):
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
214 try:
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
215 _strptime._strptime_time("2005", bad_format)
35830
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
216 except ValueError:
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
217 continue
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
218 except Exception, err:
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
219 self.fail("'%s' raised %s, not ValueError" %
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
220 (bad_format, err.__class__.__name__))
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
221 else:
029b6c5f258e Change time.strptime() to raise ValueError whenever there is an error in the
Brett Cannon <bcannon@gmail.com>
parents: 35563
diff changeset
222 self.fail("'%s' did not raise ValueError" % bad_format)
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
223
28871
f55b553a0b34 Raise a ValueError when there is data that was not covered in the format string. Done to match behavior of pre-existing C-based strptime implementations.
Brett Cannon <bcannon@gmail.com>
parents: 28686
diff changeset
224 def test_unconverteddata(self):
f55b553a0b34 Raise a ValueError when there is data that was not covered in the format string. Done to match behavior of pre-existing C-based strptime implementations.
Brett Cannon <bcannon@gmail.com>
parents: 28686
diff changeset
225 # Check ValueError is raised when there is unconverted data
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
226 self.assertRaises(ValueError, _strptime._strptime_time, "10 12", "%m")
28871
f55b553a0b34 Raise a ValueError when there is data that was not covered in the format string. Done to match behavior of pre-existing C-based strptime implementations.
Brett Cannon <bcannon@gmail.com>
parents: 28686
diff changeset
227
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
228 def helper(self, directive, position):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
229 """Helper fxn in testing."""
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
230 strf_output = time.strftime("%" + directive, self.time_tuple)
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
231 strp_output = _strptime._strptime_time(strf_output, "%" + directive)
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
232 self.failUnless(strp_output[position] == self.time_tuple[position],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
233 "testing of '%s' directive failed; '%s' -> %s != %s" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
234 (directive, strf_output, strp_output[position],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
235 self.time_tuple[position]))
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
236
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
237 def test_year(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
238 # Test that the year is handled properly
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
239 for directive in ('y', 'Y'):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
240 self.helper(directive, 0)
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
241 # Must also make sure %y values are correct for bounds set by Open Group
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
242 for century, bounds in ((1900, ('69', '99')), (2000, ('00', '68'))):
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
243 for bound in bounds:
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
244 strp_output = _strptime._strptime_time(bound, '%y')
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
245 expected_result = century + int(bound)
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
246 self.failUnless(strp_output[0] == expected_result,
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
247 "'y' test failed; passed in '%s' "
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
248 "and returned '%s'" % (bound, strp_output[0]))
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
249
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
250 def test_month(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
251 # Test for month directives
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
252 for directive in ('B', 'b', 'm'):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
253 self.helper(directive, 1)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
254
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
255 def test_day(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
256 # Test for day directives
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
257 self.helper('d', 2)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
258
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
259 def test_hour(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
260 # Test hour directives
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
261 self.helper('H', 3)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
262 strf_output = time.strftime("%I %p", self.time_tuple)
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
263 strp_output = _strptime._strptime_time(strf_output, "%I %p")
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
264 self.failUnless(strp_output[3] == self.time_tuple[3],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
265 "testing of '%%I %%p' directive failed; '%s' -> %s != %s" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
266 (strf_output, strp_output[3], self.time_tuple[3]))
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
267
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
268 def test_minute(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
269 # Test minute directives
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
270 self.helper('M', 4)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
271
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
272 def test_second(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
273 # Test second directives
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
274 self.helper('S', 5)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
275
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
276 def test_fraction(self):
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
277 import datetime
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
278 now = datetime.datetime.now()
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
279 tup, frac = _strptime._strptime(str(now), format="%Y-%m-%d %H:%M:%S.%f")
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
280 self.assertEqual(frac, now.microsecond)
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
281
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
282 def test_weekday(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
283 # Test weekday directives
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
284 for directive in ('A', 'a', 'w'):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
285 self.helper(directive,6)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
286
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
287 def test_julian(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
288 # Test julian directives
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
289 self.helper('j', 7)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
290
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
291 def test_timezone(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
292 # Test timezone directives.
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
293 # When gmtime() is used with %Z, entire result of strftime() is empty.
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
294 # Check for equal timezone names deals with bad locale info when this
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
295 # occurs; first found in FreeBSD 4.4.
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
296 strp_output = _strptime._strptime_time("UTC", "%Z")
29073
c4e8c6721e45 Beefed up timezone support. UTC and GMT are now always recognized timezones
Brett Cannon <bcannon@gmail.com>
parents: 28917
diff changeset
297 self.failUnlessEqual(strp_output.tm_isdst, 0)
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
298 strp_output = _strptime._strptime_time("GMT", "%Z")
29073
c4e8c6721e45 Beefed up timezone support. UTC and GMT are now always recognized timezones
Brett Cannon <bcannon@gmail.com>
parents: 28917
diff changeset
299 self.failUnlessEqual(strp_output.tm_isdst, 0)
30117
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
300 if sys.platform == "mac":
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
301 # Timezones don't really work on MacOS9
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
302 return
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
303 time_tuple = time.localtime()
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
304 strf_output = time.strftime("%Z") #UTC does not have a timezone
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
305 strp_output = _strptime._strptime_time(strf_output, "%Z")
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
306 locale_time = _strptime.LocaleTime()
29753
b44deeec5c5e Fixes bug of timezone value being left as -1 when ``time.tzname[0] ==
Brett Cannon <bcannon@gmail.com>
parents: 29703
diff changeset
307 if time.tzname[0] != time.tzname[1] or not time.daylight:
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
308 self.failUnless(strp_output[8] == time_tuple[8],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
309 "timezone check failed; '%s' -> %s != %s" %
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
310 (strf_output, strp_output[8], time_tuple[8]))
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
311 else:
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
312 self.failUnless(strp_output[8] == -1,
29753
b44deeec5c5e Fixes bug of timezone value being left as -1 when ``time.tzname[0] ==
Brett Cannon <bcannon@gmail.com>
parents: 29703
diff changeset
313 "LocaleTime().timezone has duplicate values and "
b44deeec5c5e Fixes bug of timezone value being left as -1 when ``time.tzname[0] ==
Brett Cannon <bcannon@gmail.com>
parents: 29703
diff changeset
314 "time.daylight but timezone value not set to -1")
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
315
30117
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
316 def test_bad_timezone(self):
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
317 # Explicitly test possibility of bad timezone;
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
318 # when time.tzname[0] == time.tzname[1] and time.daylight
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
319 if sys.platform == "mac":
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
320 return #MacOS9 has severely broken timezone support.
32639
2dbf596e0524 Fix test case for when time.tzname[0] is either UTC or GMT. Also have test
Brett Cannon <bcannon@gmail.com>
parents: 30929
diff changeset
321 tz_name = time.tzname[0]
32651
3c2d9e7ac5a1 It helps when doing checks if something is in a tuple of strings that if you
Brett Cannon <bcannon@gmail.com>
parents: 32639
diff changeset
322 if tz_name.upper() in ("UTC", "GMT"):
32639
2dbf596e0524 Fix test case for when time.tzname[0] is either UTC or GMT. Also have test
Brett Cannon <bcannon@gmail.com>
parents: 30929
diff changeset
323 return
30117
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
324 try:
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
325 original_tzname = time.tzname
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
326 original_daylight = time.daylight
30132
de28d9928855 Fix bug in test_bad_timezone where test was assuming locale knew of PDT.
Brett Cannon <bcannon@gmail.com>
parents: 30117
diff changeset
327 time.tzname = (tz_name, tz_name)
30117
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
328 time.daylight = 1
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
329 tz_value = _strptime._strptime_time(tz_name, "%Z")[8]
32639
2dbf596e0524 Fix test case for when time.tzname[0] is either UTC or GMT. Also have test
Brett Cannon <bcannon@gmail.com>
parents: 30929
diff changeset
330 self.failUnlessEqual(tz_value, -1,
2dbf596e0524 Fix test case for when time.tzname[0] is either UTC or GMT. Also have test
Brett Cannon <bcannon@gmail.com>
parents: 30929
diff changeset
331 "%s lead to a timezone value of %s instead of -1 when "
2dbf596e0524 Fix test case for when time.tzname[0] is either UTC or GMT. Also have test
Brett Cannon <bcannon@gmail.com>
parents: 30929
diff changeset
332 "time.daylight set to %s and passing in %s" %
2dbf596e0524 Fix test case for when time.tzname[0] is either UTC or GMT. Also have test
Brett Cannon <bcannon@gmail.com>
parents: 30929
diff changeset
333 (time.tzname, tz_value, time.daylight, tz_name))
30117
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
334 finally:
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
335 time.tzname = original_tzname
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
336 time.daylight = original_daylight
40aa4a10f49b Fix handling of bad locale setup where time.tzname[0] == time.tzname[1] and
Brett Cannon <bcannon@gmail.com>
parents: 30050
diff changeset
337
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
338 def test_date_time(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
339 # Test %c directive
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
340 for position in range(6):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
341 self.helper('c', position)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
342
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
343 def test_date(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
344 # Test %x directive
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
345 for position in range(0,3):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
346 self.helper('x', position)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
347
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
348 def test_time(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
349 # Test %X directive
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
350 for position in range(3,6):
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
351 self.helper('X', position)
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
352
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
353 def test_percent(self):
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
354 # Make sure % signs are handled properly
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
355 strf_output = time.strftime("%m %% %Y", self.time_tuple)
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
356 strp_output = _strptime._strptime_time(strf_output, "%m %% %Y")
26439
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
357 self.failUnless(strp_output[0] == self.time_tuple[0] and
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
358 strp_output[1] == self.time_tuple[1],
c5b1305081df Patch #639112: fixes for None locale and tz.
Martin v. Löwis <martin@v.loewis.de>
parents: 25372
diff changeset
359 "handling of percent sign failed")
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
360
25372
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
361 def test_caseinsensitive(self):
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
362 # Should handle names case-insensitively.
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
363 strf_output = time.strftime("%B", self.time_tuple)
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
364 self.failUnless(_strptime._strptime_time(strf_output.upper(), "%B"),
25372
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
365 "strptime does not handle ALL-CAPS names properly")
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
366 self.failUnless(_strptime._strptime_time(strf_output.lower(), "%B"),
25372
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
367 "strptime does not handle lowercase names properly")
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
368 self.failUnless(_strptime._strptime_time(strf_output.capitalize(), "%B"),
25372
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
369 "strptime does not handle capword names properly")
caa3a2fc6a20 Brett's fixes for various bugs and coding issues. Closes SF patch #
Barry Warsaw <barry@python.org>
parents: 25113
diff changeset
370
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
371 def test_defaults(self):
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
372 # Default return value should be (1900, 1, 1, 0, 0, 0, 0, 1, 0)
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
373 defaults = (1900, 1, 1, 0, 0, 0, 0, 1, -1)
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
374 strp_output = _strptime._strptime_time('1', '%m')
27288
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
375 self.failUnless(strp_output == defaults,
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
376 "Default values for strptime() are incorrect;"
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
377 " %s != %s" % (strp_output, defaults))
97f494bf7319 SF patch 670012: Compatibility changes for _strptime.py.
Tim Peters <tim.peters@gmail.com>
parents: 26798
diff changeset
378
30228
a0f53a069470 Make sure parentheses are escaped when used in the format string.
Brett Cannon <bcannon@gmail.com>
parents: 30132
diff changeset
379 def test_escaping(self):
a0f53a069470 Make sure parentheses are escaped when used in the format string.
Brett Cannon <bcannon@gmail.com>
parents: 30132
diff changeset
380 # Make sure all characters that have regex significance are escaped.
a0f53a069470 Make sure parentheses are escaped when used in the format string.
Brett Cannon <bcannon@gmail.com>
parents: 30132
diff changeset
381 # Parentheses are in a purposeful order; will cause an error of
a0f53a069470 Make sure parentheses are escaped when used in the format string.
Brett Cannon <bcannon@gmail.com>
parents: 30132
diff changeset
382 # unbalanced parentheses when the regex is compiled if they are not
a0f53a069470 Make sure parentheses are escaped when used in the format string.
Brett Cannon <bcannon@gmail.com>
parents: 30132
diff changeset
383 # escaped.
a0f53a069470 Make sure parentheses are escaped when used in the format string.
Brett Cannon <bcannon@gmail.com>
parents: 30132
diff changeset
384 # Test instigated by bug #796149 .
a0f53a069470 Make sure parentheses are escaped when used in the format string.
Brett Cannon <bcannon@gmail.com>
parents: 30132
diff changeset
385 need_escaping = ".^$*+?{}\[]|)("
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
386 self.failUnless(_strptime._strptime_time(need_escaping, need_escaping))
30228
a0f53a069470 Make sure parentheses are escaped when used in the format string.
Brett Cannon <bcannon@gmail.com>
parents: 30132
diff changeset
387
25069
8231f86c8628 The test I saw failing this morning just happened to be run at 8am
Barry Warsaw <barry@python.org>
parents: 24959
diff changeset
388 class Strptime12AMPMTests(unittest.TestCase):
8231f86c8628 The test I saw failing this morning just happened to be run at 8am
Barry Warsaw <barry@python.org>
parents: 24959
diff changeset
389 """Test a _strptime regression in '%I %p' at 12 noon (12 PM)"""
8231f86c8628 The test I saw failing this morning just happened to be run at 8am
Barry Warsaw <barry@python.org>
parents: 24959
diff changeset
390
8231f86c8628 The test I saw failing this morning just happened to be run at 8am
Barry Warsaw <barry@python.org>
parents: 24959
diff changeset
391 def test_twelve_noon_midnight(self):
8231f86c8628 The test I saw failing this morning just happened to be run at 8am
Barry Warsaw <barry@python.org>
parents: 24959
diff changeset
392 eq = self.assertEqual
8231f86c8628 The test I saw failing this morning just happened to be run at 8am
Barry Warsaw <barry@python.org>
parents: 24959
diff changeset
393 eq(time.strptime('12 PM', '%I %p')[3], 12)
8231f86c8628 The test I saw failing this morning just happened to be run at 8am
Barry Warsaw <barry@python.org>
parents: 24959
diff changeset
394 eq(time.strptime('12 AM', '%I %p')[3], 0)
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
395 eq(_strptime._strptime_time('12 PM', '%I %p')[3], 12)
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
396 eq(_strptime._strptime_time('12 AM', '%I %p')[3], 0)
25069
8231f86c8628 The test I saw failing this morning just happened to be run at 8am
Barry Warsaw <barry@python.org>
parents: 24959
diff changeset
397
8231f86c8628 The test I saw failing this morning just happened to be run at 8am
Barry Warsaw <barry@python.org>
parents: 24959
diff changeset
398
26798
0f06156c8e03 Fix julian day problem with strptime. Note: XXX about using 0, suggestions?
Neal Norwitz <nnorwitz@gmail.com>
parents: 26439
diff changeset
399 class JulianTests(unittest.TestCase):
0f06156c8e03 Fix julian day problem with strptime. Note: XXX about using 0, suggestions?
Neal Norwitz <nnorwitz@gmail.com>
parents: 26439
diff changeset
400 """Test a _strptime regression that all julian (1-366) are accepted"""
0f06156c8e03 Fix julian day problem with strptime. Note: XXX about using 0, suggestions?
Neal Norwitz <nnorwitz@gmail.com>
parents: 26439
diff changeset
401
0f06156c8e03 Fix julian day problem with strptime. Note: XXX about using 0, suggestions?
Neal Norwitz <nnorwitz@gmail.com>
parents: 26439
diff changeset
402 def test_all_julian_days(self):
0f06156c8e03 Fix julian day problem with strptime. Note: XXX about using 0, suggestions?
Neal Norwitz <nnorwitz@gmail.com>
parents: 26439
diff changeset
403 eq = self.assertEqual
0f06156c8e03 Fix julian day problem with strptime. Note: XXX about using 0, suggestions?
Neal Norwitz <nnorwitz@gmail.com>
parents: 26439
diff changeset
404 for i in range(1, 367):
0f06156c8e03 Fix julian day problem with strptime. Note: XXX about using 0, suggestions?
Neal Norwitz <nnorwitz@gmail.com>
parents: 26439
diff changeset
405 # use 2004, since it is a leap year, we have 366 days
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
406 eq(_strptime._strptime_time('%d 2004' % i, '%j %Y')[7], i)
26798
0f06156c8e03 Fix julian day problem with strptime. Note: XXX about using 0, suggestions?
Neal Norwitz <nnorwitz@gmail.com>
parents: 26439
diff changeset
407
28243
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
408 class CalculationTests(unittest.TestCase):
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
409 """Test that strptime() fills in missing info correctly"""
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
410
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
411 def setUp(self):
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
412 self.time_tuple = time.gmtime()
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
413
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
414 def test_julian_calculation(self):
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
415 # Make sure that when Julian is missing that it is calculated
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
416 format_string = "%Y %m %d %H %M %S %w %Z"
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
417 result = _strptime._strptime_time(time.strftime(format_string, self.time_tuple),
28243
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
418 format_string)
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
419 self.failUnless(result.tm_yday == self.time_tuple.tm_yday,
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
420 "Calculation of tm_yday failed; %s != %s" %
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
421 (result.tm_yday, self.time_tuple.tm_yday))
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
422
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
423 def test_gregorian_calculation(self):
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
424 # Test that Gregorian date can be calculated from Julian day
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
425 format_string = "%Y %H %M %S %w %j %Z"
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
426 result = _strptime._strptime_time(time.strftime(format_string, self.time_tuple),
28243
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
427 format_string)
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
428 self.failUnless(result.tm_year == self.time_tuple.tm_year and
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
429 result.tm_mon == self.time_tuple.tm_mon and
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
430 result.tm_mday == self.time_tuple.tm_mday,
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
431 "Calculation of Gregorian date failed;"
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
432 "%s-%s-%s != %s-%s-%s" %
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
433 (result.tm_year, result.tm_mon, result.tm_mday,
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
434 self.time_tuple.tm_year, self.time_tuple.tm_mon,
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
435 self.time_tuple.tm_mday))
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
436
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
437 def test_day_of_week_calculation(self):
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
438 # Test that the day of the week is calculated as needed
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
439 format_string = "%Y %m %d %H %S %j %Z"
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
440 result = _strptime._strptime_time(time.strftime(format_string, self.time_tuple),
28243
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
441 format_string)
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
442 self.failUnless(result.tm_wday == self.time_tuple.tm_wday,
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
443 "Calculation of day of the week failed;"
f13adc00c165 SF patch #691928: Use datetime in _strptime
Raymond Hettinger <python@rcn.com>
parents: 27288
diff changeset
444 "%s != %s" % (result.tm_wday, self.time_tuple.tm_wday))
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
445
33784
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
446 def test_week_of_year_and_day_of_week_calculation(self):
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
447 # Should be able to infer date if given year, week of year (%U or %W)
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
448 # and day of the week
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
449 def test_helper(ymd_tuple, test_reason):
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
450 for directive in ('W', 'U'):
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
451 format_string = "%%Y %%%s %%w" % directive
33853
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
452 dt_date = datetime_date(*ymd_tuple)
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
453 strp_input = dt_date.strftime(format_string)
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
454 strp_output = _strptime._strptime_time(strp_input, format_string)
33784
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
455 self.failUnless(strp_output[:3] == ymd_tuple,
33853
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
456 "%s(%s) test failed w/ '%s': %s != %s (%s != %s)" %
33784
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
457 (test_reason, directive, strp_input,
33853
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
458 strp_output[:3], ymd_tuple,
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
459 strp_output[7], dt_date.timetuple()[7]))
33784
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
460 test_helper((1901, 1, 3), "week 0")
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
461 test_helper((1901, 1, 8), "common case")
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
462 test_helper((1901, 1, 13), "day on Sunday")
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
463 test_helper((1901, 1, 14), "day on Monday")
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
464 test_helper((1905, 1, 1), "Jan 1 on Sunday")
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
465 test_helper((1906, 1, 1), "Jan 1 on Monday")
33853
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
466 test_helper((1906, 1, 7), "first Sunday in a year starting on Monday")
33784
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
467 test_helper((1905, 12, 31), "Dec 31 on Sunday")
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
468 test_helper((1906, 12, 31), "Dec 31 on Monday")
33853
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
469 test_helper((2008, 12, 29), "Monday in the last week of the year")
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
470 test_helper((2008, 12, 22), "Monday in the second-to-last week of the "
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
471 "year")
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
472 test_helper((1978, 10, 23), "randomly chosen date")
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
473 test_helper((2004, 12, 18), "randomly chosen date")
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
474 test_helper((1978, 10, 23), "year starting and ending on Monday while "
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
475 "date not on Sunday or Monday")
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
476 test_helper((1917, 12, 17), "year starting and ending on Monday with "
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
477 "a Monday not at the beginning or end "
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
478 "of the year")
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
479 test_helper((1917, 12, 31), "Dec 31 on Monday with year starting and "
d41ac11e9c60 Fix bug of implementation of algorithm for calculating the date from year, week
Brett Cannon <bcannon@gmail.com>
parents: 33784
diff changeset
480 "ending on Monday")
40714
15deca39e0e6 Fix time.strptime's %U support. Basically rewrote the algorithm to be more
Brett Cannon <bcannon@gmail.com>
parents: 35830
diff changeset
481 test_helper((2007, 01, 07), "First Sunday of 2007")
15deca39e0e6 Fix time.strptime's %U support. Basically rewrote the algorithm to be more
Brett Cannon <bcannon@gmail.com>
parents: 35830
diff changeset
482 test_helper((2007, 01, 14), "Second Sunday of 2007")
15deca39e0e6 Fix time.strptime's %U support. Basically rewrote the algorithm to be more
Brett Cannon <bcannon@gmail.com>
parents: 35830
diff changeset
483 test_helper((2006, 12, 31), "Last Sunday of 2006")
15deca39e0e6 Fix time.strptime's %U support. Basically rewrote the algorithm to be more
Brett Cannon <bcannon@gmail.com>
parents: 35830
diff changeset
484 test_helper((2006, 12, 24), "Second to last Sunday of 2006")
33784
f175c9838373 Add support for %U and %W to contribute to calculating the date when the year
Brett Cannon <bcannon@gmail.com>
parents: 33674
diff changeset
485
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
486
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
487 class CacheTests(unittest.TestCase):
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
488 """Test that caching works properly."""
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
489
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
490 def test_time_re_recreation(self):
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
491 # Make sure cache is recreated when current locale does not match what
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
492 # cached object was created with.
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
493 _strptime._strptime_time("10", "%d")
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
494 _strptime._strptime_time("2005", "%Y")
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
495 _strptime._TimeRE_cache.locale_time.lang = "Ni"
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
496 original_time_re = id(_strptime._TimeRE_cache)
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
497 _strptime._strptime_time("10", "%d")
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
498 self.failIfEqual(original_time_re, id(_strptime._TimeRE_cache))
35563
dfabf0c7f1ad Clear the regex cache when the locale changes.
Brett Cannon <bcannon@gmail.com>
parents: 33853
diff changeset
499 self.failUnlessEqual(len(_strptime._regex_cache), 1)
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
500
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
501 def test_regex_cleanup(self):
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
502 # Make sure cached regexes are discarded when cache becomes "full".
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
503 try:
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
504 del _strptime._regex_cache['%d']
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
505 except KeyError:
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
506 pass
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
507 bogus_key = 0
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
508 while len(_strptime._regex_cache) <= _strptime._CACHE_MAX_SIZE:
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
509 _strptime._regex_cache[bogus_key] = None
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
510 bogus_key += 1
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
511 _strptime._strptime_time("10", "%d")
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
512 self.failUnlessEqual(len(_strptime._regex_cache), 1)
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
513
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
514 def test_new_localetime(self):
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
515 # A new LocaleTime instance should be created when a new TimeRE object
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
516 # is created.
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
517 locale_time_id = id(_strptime._TimeRE_cache.locale_time)
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
518 _strptime._TimeRE_cache.locale_time.lang = "Ni"
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
519 _strptime._strptime_time("10", "%d")
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
520 self.failIfEqual(locale_time_id,
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
521 id(_strptime._TimeRE_cache.locale_time))
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
522
41349
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
523 def test_TimeRE_recreation(self):
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
524 # The TimeRE instance should be recreated upon changing the locale.
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
525 locale_info = locale.getlocale(locale.LC_TIME)
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
526 try:
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
527 locale.setlocale(locale.LC_TIME, ('en_US', 'UTF8'))
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
528 except locale.Error:
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
529 return
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
530 try:
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
531 _strptime._strptime_time('10', '%d')
41350
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
532 # Get id of current cache object.
41349
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
533 first_time_re_id = id(_strptime._TimeRE_cache)
41350
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
534 try:
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
535 # Change the locale and force a recreation of the cache.
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
536 locale.setlocale(locale.LC_TIME, ('de_DE', 'UTF8'))
45767
212e9c8ad087 add %f format to datetime - issue 1158
Skip Montanaro <skip@pobox.com>
parents: 41938
diff changeset
537 _strptime._strptime_time('10', '%d')
41350
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
538 # Get the new cache object's id.
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
539 second_time_re_id = id(_strptime._TimeRE_cache)
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
540 # They should not be equal.
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
541 self.failIfEqual(first_time_re_id, second_time_re_id)
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
542 # Possible test locale is not supported while initial locale is.
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
543 # If this is the case just suppress the exception and fall-through
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
544 # to the reseting to the original locale.
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
545 except locale.Error:
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
546 pass
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
547 # Make sure we don't trample on the locale setting once we leave the
696a666dfe61 Fix the test for recreating the locale cache object by not worrying about if
Brett Cannon <bcannon@gmail.com>
parents: 41349
diff changeset
548 # test.
41349
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
549 finally:
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
550 locale.setlocale(locale.LC_TIME, locale_info)
b5b750cf85c2 time.strptime's caching of its locale object was being recreated when the
Brett Cannon <bcannon@gmail.com>
parents: 40714
diff changeset
551
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
552
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
553 def test_main():
28917
1741af48fd9f Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents: 28871
diff changeset
554 test_support.run_unittest(
29991
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
555 getlang_Tests,
28917
1741af48fd9f Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents: 28871
diff changeset
556 LocaleTime_Tests,
1741af48fd9f Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents: 28871
diff changeset
557 TimeRETests,
1741af48fd9f Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents: 28871
diff changeset
558 StrptimeTests,
1741af48fd9f Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents: 28871
diff changeset
559 Strptime12AMPMTests,
1741af48fd9f Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents: 28871
diff changeset
560 JulianTests,
29991
b33c60fcce74 Remove caching of TimeRE (and thus LocaleTime) instance. Error was being
Brett Cannon <bcannon@gmail.com>
parents: 29975
diff changeset
561 CalculationTests,
30050
494b07a5e2e5 Re-introduce caching of TimeRE and compiled regexes with added thread-safety.
Brett Cannon <bcannon@gmail.com>
parents: 29991
diff changeset
562 CacheTests
28917
1741af48fd9f Combine the functionality of test_support.run_unittest()
Walter Dörwald <walter@livinglogic.de>
parents: 28871
diff changeset
563 )
24322
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
564
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
565
afe479a6235e Pure Python strptime implementation by Brett Cannon. See SF patch 474274.
Guido van Rossum <guido@python.org>
parents:
diff changeset
566 if __name__ == '__main__':
24959
8b6bf5bc5122 Standardize behavior: no docstrings in test functions; add a proper
Guido van Rossum <guido@python.org>
parents: 24674
diff changeset
567 test_main()