diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
| commit | 3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (patch) | |
| tree | dd97578d333a72ac825c0e7ad64e4367d8dfe248 /Lib/test/test_strptime.py | |
| parent | cc4a4842643d6415ca4a449e9d0557cfb029715a (diff) | |
| parent | 13925008dc11f2a235627dc8c0440c0ce99171d9 (diff) | |
| download | cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.zip cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.gz cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.bz2 | |
#11565: Merge with 3.1.
Diffstat (limited to 'Lib/test/test_strptime.py')
| -rw-r--r-- | Lib/test/test_strptime.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py index 77d3789..89c08ed 100644 --- a/Lib/test/test_strptime.py +++ b/Lib/test/test_strptime.py @@ -536,7 +536,7 @@ class CacheTests(unittest.TestCase): self.assertIsNot(first_time_re, second_time_re) # Possible test locale is not supported while initial locale is. # If this is the case just suppress the exception and fall-through - # to the reseting to the original locale. + # to the resetting to the original locale. except locale.Error: pass # Make sure we don't trample on the locale setting once we leave the |