mirror of
https://github.com/python/cpython.git
synced 2025-10-24 10:23:58 +00:00
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
561 lines
25 KiB
Python
561 lines
25 KiB
Python
"""PyUnit testing against strptime"""
|
|
|
|
import unittest
|
|
import time
|
|
import locale
|
|
import re
|
|
import sys
|
|
from test import test_support
|
|
from datetime import date as datetime_date
|
|
|
|
import _strptime
|
|
|
|
class getlang_Tests(unittest.TestCase):
|
|
"""Test _getlang"""
|
|
def test_basic(self):
|
|
self.failUnlessEqual(_strptime._getlang(), locale.getlocale(locale.LC_TIME))
|
|
|
|
class LocaleTime_Tests(unittest.TestCase):
|
|
"""Tests for _strptime.LocaleTime.
|
|
|
|
All values are lower-cased when stored in LocaleTime, so make sure to
|
|
compare values after running ``lower`` on them.
|
|
|
|
"""
|
|
|
|
def setUp(self):
|
|
"""Create time tuple based on current time."""
|
|
self.time_tuple = time.localtime()
|
|
self.LT_ins = _strptime.LocaleTime()
|
|
|
|
def compare_against_time(self, testing, directive, tuple_position,
|
|
error_msg):
|
|
"""Helper method that tests testing against directive based on the
|
|
tuple_position of time_tuple. Uses error_msg as error message.
|
|
|
|
"""
|
|
strftime_output = time.strftime(directive, self.time_tuple).lower()
|
|
comparison = testing[self.time_tuple[tuple_position]]
|
|
self.failUnless(strftime_output in testing, "%s: not found in tuple" %
|
|
error_msg)
|
|
self.failUnless(comparison == strftime_output,
|
|
"%s: position within tuple incorrect; %s != %s" %
|
|
(error_msg, comparison, strftime_output))
|
|
|
|
def test_weekday(self):
|
|
# Make sure that full and abbreviated weekday names are correct in
|
|
# both string and position with tuple
|
|
self.compare_against_time(self.LT_ins.f_weekday, '%A', 6,
|
|
"Testing of full weekday name failed")
|
|
self.compare_against_time(self.LT_ins.a_weekday, '%a', 6,
|
|
"Testing of abbreviated weekday name failed")
|
|
|
|
def test_month(self):
|
|
# Test full and abbreviated month names; both string and position
|
|
# within the tuple
|
|
self.compare_against_time(self.LT_ins.f_month, '%B', 1,
|
|
"Testing against full month name failed")
|
|
self.compare_against_time(self.LT_ins.a_month, '%b', 1,
|
|
"Testing against abbreviated month name failed")
|
|
|
|
def test_am_pm(self):
|
|
# Make sure AM/PM representation done properly
|
|
strftime_output = time.strftime("%p", self.time_tuple).lower()
|
|
self.failUnless(strftime_output in self.LT_ins.am_pm,
|
|
"AM/PM representation not in tuple")
|
|
if self.time_tuple[3] < 12: position = 0
|
|
else: position = 1
|
|
self.failUnless(strftime_output == self.LT_ins.am_pm[position],
|
|
"AM/PM representation in the wrong position within the tuple")
|
|
|
|
def test_timezone(self):
|
|
# Make sure timezone is correct
|
|
timezone = time.strftime("%Z", self.time_tuple).lower()
|
|
if timezone:
|
|
self.failUnless(timezone in self.LT_ins.timezone[0] or \
|
|
timezone in self.LT_ins.timezone[1],
|
|
"timezone %s not found in %s" %
|
|
(timezone, self.LT_ins.timezone))
|
|
|
|
def test_date_time(self):
|
|
# Check that LC_date_time, LC_date, and LC_time are correct
|
|
# the magic date is used so as to not have issues with %c when day of
|
|
# the month is a single digit and has a leading space. This is not an
|
|
# issue since strptime still parses it correctly. The problem is
|
|
# testing these directives for correctness by comparing strftime
|
|
# output.
|
|
magic_date = (1999, 3, 17, 22, 44, 55, 2, 76, 0)
|
|
strftime_output = time.strftime("%c", magic_date)
|
|
self.failUnless(strftime_output == time.strftime(self.LT_ins.LC_date_time,
|
|
magic_date),
|
|
"LC_date_time incorrect")
|
|
strftime_output = time.strftime("%x", magic_date)
|
|
self.failUnless(strftime_output == time.strftime(self.LT_ins.LC_date,
|
|
magic_date),
|
|
"LC_date incorrect")
|
|
strftime_output = time.strftime("%X", magic_date)
|
|
self.failUnless(strftime_output == time.strftime(self.LT_ins.LC_time,
|
|
magic_date),
|
|
"LC_time incorrect")
|
|
LT = _strptime.LocaleTime()
|
|
LT.am_pm = ('', '')
|
|
self.failUnless(LT.LC_time, "LocaleTime's LC directives cannot handle "
|
|
"empty strings")
|
|
|
|
def test_lang(self):
|
|
# Make sure lang is set to what _getlang() returns
|
|
# Assuming locale has not changed between now and when self.LT_ins was created
|
|
self.failUnlessEqual(self.LT_ins.lang, _strptime._getlang())
|
|
|
|
|
|
class TimeRETests(unittest.TestCase):
|
|
"""Tests for TimeRE."""
|
|
|
|
def setUp(self):
|
|
"""Construct generic TimeRE object."""
|
|
self.time_re = _strptime.TimeRE()
|
|
self.locale_time = _strptime.LocaleTime()
|
|
|
|
def test_pattern(self):
|
|
# Test TimeRE.pattern
|
|
pattern_string = self.time_re.pattern(r"%a %A %d")
|
|
self.failUnless(pattern_string.find(self.locale_time.a_weekday[2]) != -1,
|
|
"did not find abbreviated weekday in pattern string '%s'" %
|
|
pattern_string)
|
|
self.failUnless(pattern_string.find(self.locale_time.f_weekday[4]) != -1,
|
|
"did not find full weekday in pattern string '%s'" %
|
|
pattern_string)
|
|
self.failUnless(pattern_string.find(self.time_re['d']) != -1,
|
|
"did not find 'd' directive pattern string '%s'" %
|
|
pattern_string)
|
|
|
|
def test_pattern_escaping(self):
|
|
# Make sure any characters in the format string that might be taken as
|
|
# regex syntax is escaped.
|
|
pattern_string = self.time_re.pattern("\d+")
|
|
self.failUnless(r"\\d\+" in pattern_string,
|
|
"%s does not have re characters escaped properly" %
|
|
pattern_string)
|
|
|
|
def test_compile(self):
|
|
# Check that compiled regex is correct
|
|
found = self.time_re.compile(r"%A").match(self.locale_time.f_weekday[6])
|
|
self.failUnless(found and found.group('A') == self.locale_time.f_weekday[6],
|
|
"re object for '%A' failed")
|
|
compiled = self.time_re.compile(r"%a %b")
|
|
found = compiled.match("%s %s" % (self.locale_time.a_weekday[4],
|
|
self.locale_time.a_month[4]))
|
|
self.failUnless(found,
|
|
"Match failed with '%s' regex and '%s' string" %
|
|
(compiled.pattern, "%s %s" % (self.locale_time.a_weekday[4],
|
|
self.locale_time.a_month[4])))
|
|
self.failUnless(found.group('a') == self.locale_time.a_weekday[4] and
|
|
found.group('b') == self.locale_time.a_month[4],
|
|
"re object couldn't find the abbreviated weekday month in "
|
|
"'%s' using '%s'; group 'a' = '%s', group 'b' = %s'" %
|
|
(found.string, found.re.pattern, found.group('a'),
|
|
found.group('b')))
|
|
for directive in ('a','A','b','B','c','d','H','I','j','m','M','p','S',
|
|
'U','w','W','x','X','y','Y','Z','%'):
|
|
compiled = self.time_re.compile("%" + directive)
|
|
found = compiled.match(time.strftime("%" + directive))
|
|
self.failUnless(found, "Matching failed on '%s' using '%s' regex" %
|
|
(time.strftime("%" + directive),
|
|
compiled.pattern))
|
|
|
|
def test_blankpattern(self):
|
|
# Make sure when tuple or something has no values no regex is generated.
|
|
# Fixes bug #661354
|
|
test_locale = _strptime.LocaleTime()
|
|
test_locale.timezone = (frozenset(), frozenset())
|
|
self.failUnless(_strptime.TimeRE(test_locale).pattern("%Z") == '',
|
|
"with timezone == ('',''), TimeRE().pattern('%Z') != ''")
|
|
|
|
def test_matching_with_escapes(self):
|
|
# Make sure a format that requires escaping of characters works
|
|
compiled_re = self.time_re.compile("\w+ %m")
|
|
found = compiled_re.match("\w+ 10")
|
|
self.failUnless(found, "Escaping failed of format '\w+ 10'")
|
|
|
|
def test_locale_data_w_regex_metacharacters(self):
|
|
# Check that if locale data contains regex metacharacters they are
|
|
# escaped properly.
|
|
# Discovered by bug #1039270 .
|
|
locale_time = _strptime.LocaleTime()
|
|
locale_time.timezone = (frozenset(("utc", "gmt",
|
|
"Tokyo (standard time)")),
|
|
frozenset("Tokyo (daylight time)"))
|
|
time_re = _strptime.TimeRE(locale_time)
|
|
self.failUnless(time_re.compile("%Z").match("Tokyo (standard time)"),
|
|
"locale data that contains regex metacharacters is not"
|
|
" properly escaped")
|
|
|
|
def test_whitespace_substitution(self):
|
|
# When pattern contains whitespace, make sure it is taken into account
|
|
# so as to not allow to subpatterns to end up next to each other and
|
|
# "steal" characters from each other.
|
|
pattern = self.time_re.pattern('%j %H')
|
|
self.failUnless(not re.match(pattern, "180"))
|
|
self.failUnless(re.match(pattern, "18 0"))
|
|
|
|
|
|
class StrptimeTests(unittest.TestCase):
|
|
"""Tests for _strptime.strptime."""
|
|
|
|
def setUp(self):
|
|
"""Create testing time tuple."""
|
|
self.time_tuple = time.gmtime()
|
|
|
|
def test_ValueError(self):
|
|
# Make sure ValueError is raised when match fails or format is bad
|
|
self.assertRaises(ValueError, _strptime.strptime, data_string="%d",
|
|
format="%A")
|
|
for bad_format in ("%", "% ", "%e"):
|
|
try:
|
|
_strptime.strptime("2005", bad_format)
|
|
except ValueError:
|
|
continue
|
|
except Exception as err:
|
|
self.fail("'%s' raised %s, not ValueError" %
|
|
(bad_format, err.__class__.__name__))
|
|
else:
|
|
self.fail("'%s' did not raise ValueError" % bad_format)
|
|
|
|
def test_unconverteddata(self):
|
|
# Check ValueError is raised when there is unconverted data
|
|
self.assertRaises(ValueError, _strptime.strptime, "10 12", "%m")
|
|
|
|
def helper(self, directive, position):
|
|
"""Helper fxn in testing."""
|
|
strf_output = time.strftime("%" + directive, self.time_tuple)
|
|
strp_output = _strptime.strptime(strf_output, "%" + directive)
|
|
self.failUnless(strp_output[position] == self.time_tuple[position],
|
|
"testing of '%s' directive failed; '%s' -> %s != %s" %
|
|
(directive, strf_output, strp_output[position],
|
|
self.time_tuple[position]))
|
|
|
|
def test_year(self):
|
|
# Test that the year is handled properly
|
|
for directive in ('y', 'Y'):
|
|
self.helper(directive, 0)
|
|
# Must also make sure %y values are correct for bounds set by Open Group
|
|
for century, bounds in ((1900, ('69', '99')), (2000, ('00', '68'))):
|
|
for bound in bounds:
|
|
strp_output = _strptime.strptime(bound, '%y')
|
|
expected_result = century + int(bound)
|
|
self.failUnless(strp_output[0] == expected_result,
|
|
"'y' test failed; passed in '%s' "
|
|
"and returned '%s'" % (bound, strp_output[0]))
|
|
|
|
def test_month(self):
|
|
# Test for month directives
|
|
for directive in ('B', 'b', 'm'):
|
|
self.helper(directive, 1)
|
|
|
|
def test_day(self):
|
|
# Test for day directives
|
|
self.helper('d', 2)
|
|
|
|
def test_hour(self):
|
|
# Test hour directives
|
|
self.helper('H', 3)
|
|
strf_output = time.strftime("%I %p", self.time_tuple)
|
|
strp_output = _strptime.strptime(strf_output, "%I %p")
|
|
self.failUnless(strp_output[3] == self.time_tuple[3],
|
|
"testing of '%%I %%p' directive failed; '%s' -> %s != %s" %
|
|
(strf_output, strp_output[3], self.time_tuple[3]))
|
|
|
|
def test_minute(self):
|
|
# Test minute directives
|
|
self.helper('M', 4)
|
|
|
|
def test_second(self):
|
|
# Test second directives
|
|
self.helper('S', 5)
|
|
|
|
def test_weekday(self):
|
|
# Test weekday directives
|
|
for directive in ('A', 'a', 'w'):
|
|
self.helper(directive,6)
|
|
|
|
def test_julian(self):
|
|
# Test julian directives
|
|
self.helper('j', 7)
|
|
|
|
def test_timezone(self):
|
|
# Test timezone directives.
|
|
# When gmtime() is used with %Z, entire result of strftime() is empty.
|
|
# Check for equal timezone names deals with bad locale info when this
|
|
# occurs; first found in FreeBSD 4.4.
|
|
strp_output = _strptime.strptime("UTC", "%Z")
|
|
self.failUnlessEqual(strp_output.tm_isdst, 0)
|
|
strp_output = _strptime.strptime("GMT", "%Z")
|
|
self.failUnlessEqual(strp_output.tm_isdst, 0)
|
|
if sys.platform == "mac":
|
|
# Timezones don't really work on MacOS9
|
|
return
|
|
time_tuple = time.localtime()
|
|
strf_output = time.strftime("%Z") #UTC does not have a timezone
|
|
strp_output = _strptime.strptime(strf_output, "%Z")
|
|
locale_time = _strptime.LocaleTime()
|
|
if time.tzname[0] != time.tzname[1] or not time.daylight:
|
|
self.failUnless(strp_output[8] == time_tuple[8],
|
|
"timezone check failed; '%s' -> %s != %s" %
|
|
(strf_output, strp_output[8], time_tuple[8]))
|
|
else:
|
|
self.failUnless(strp_output[8] == -1,
|
|
"LocaleTime().timezone has duplicate values and "
|
|
"time.daylight but timezone value not set to -1")
|
|
|
|
def test_bad_timezone(self):
|
|
# Explicitly test possibility of bad timezone;
|
|
# when time.tzname[0] == time.tzname[1] and time.daylight
|
|
if sys.platform == "mac":
|
|
return #MacOS9 has severely broken timezone support.
|
|
tz_name = time.tzname[0]
|
|
if tz_name.upper() in ("UTC", "GMT"):
|
|
return
|
|
try:
|
|
original_tzname = time.tzname
|
|
original_daylight = time.daylight
|
|
time.tzname = (tz_name, tz_name)
|
|
time.daylight = 1
|
|
tz_value = _strptime.strptime(tz_name, "%Z")[8]
|
|
self.failUnlessEqual(tz_value, -1,
|
|
"%s lead to a timezone value of %s instead of -1 when "
|
|
"time.daylight set to %s and passing in %s" %
|
|
(time.tzname, tz_value, time.daylight, tz_name))
|
|
finally:
|
|
time.tzname = original_tzname
|
|
time.daylight = original_daylight
|
|
|
|
def test_date_time(self):
|
|
# Test %c directive
|
|
for position in range(6):
|
|
self.helper('c', position)
|
|
|
|
def test_date(self):
|
|
# Test %x directive
|
|
for position in range(0,3):
|
|
self.helper('x', position)
|
|
|
|
def test_time(self):
|
|
# Test %X directive
|
|
for position in range(3,6):
|
|
self.helper('X', position)
|
|
|
|
def test_percent(self):
|
|
# Make sure % signs are handled properly
|
|
strf_output = time.strftime("%m %% %Y", self.time_tuple)
|
|
strp_output = _strptime.strptime(strf_output, "%m %% %Y")
|
|
self.failUnless(strp_output[0] == self.time_tuple[0] and
|
|
strp_output[1] == self.time_tuple[1],
|
|
"handling of percent sign failed")
|
|
|
|
def test_caseinsensitive(self):
|
|
# Should handle names case-insensitively.
|
|
strf_output = time.strftime("%B", self.time_tuple)
|
|
self.failUnless(_strptime.strptime(strf_output.upper(), "%B"),
|
|
"strptime does not handle ALL-CAPS names properly")
|
|
self.failUnless(_strptime.strptime(strf_output.lower(), "%B"),
|
|
"strptime does not handle lowercase names properly")
|
|
self.failUnless(_strptime.strptime(strf_output.capitalize(), "%B"),
|
|
"strptime does not handle capword names properly")
|
|
|
|
def test_defaults(self):
|
|
# Default return value should be (1900, 1, 1, 0, 0, 0, 0, 1, 0)
|
|
defaults = (1900, 1, 1, 0, 0, 0, 0, 1, -1)
|
|
strp_output = _strptime.strptime('1', '%m')
|
|
self.failUnless(strp_output == defaults,
|
|
"Default values for strptime() are incorrect;"
|
|
" %s != %s" % (strp_output, defaults))
|
|
|
|
def test_escaping(self):
|
|
# Make sure all characters that have regex significance are escaped.
|
|
# Parentheses are in a purposeful order; will cause an error of
|
|
# unbalanced parentheses when the regex is compiled if they are not
|
|
# escaped.
|
|
# Test instigated by bug #796149 .
|
|
need_escaping = ".^$*+?{}\[]|)("
|
|
self.failUnless(_strptime.strptime(need_escaping, need_escaping))
|
|
|
|
class Strptime12AMPMTests(unittest.TestCase):
|
|
"""Test a _strptime regression in '%I %p' at 12 noon (12 PM)"""
|
|
|
|
def test_twelve_noon_midnight(self):
|
|
eq = self.assertEqual
|
|
eq(time.strptime('12 PM', '%I %p')[3], 12)
|
|
eq(time.strptime('12 AM', '%I %p')[3], 0)
|
|
eq(_strptime.strptime('12 PM', '%I %p')[3], 12)
|
|
eq(_strptime.strptime('12 AM', '%I %p')[3], 0)
|
|
|
|
|
|
class JulianTests(unittest.TestCase):
|
|
"""Test a _strptime regression that all julian (1-366) are accepted"""
|
|
|
|
def test_all_julian_days(self):
|
|
eq = self.assertEqual
|
|
for i in range(1, 367):
|
|
# use 2004, since it is a leap year, we have 366 days
|
|
eq(_strptime.strptime('%d 2004' % i, '%j %Y')[7], i)
|
|
|
|
class CalculationTests(unittest.TestCase):
|
|
"""Test that strptime() fills in missing info correctly"""
|
|
|
|
def setUp(self):
|
|
self.time_tuple = time.gmtime()
|
|
|
|
def test_julian_calculation(self):
|
|
# Make sure that when Julian is missing that it is calculated
|
|
format_string = "%Y %m %d %H %M %S %w %Z"
|
|
result = _strptime.strptime(time.strftime(format_string, self.time_tuple),
|
|
format_string)
|
|
self.failUnless(result.tm_yday == self.time_tuple.tm_yday,
|
|
"Calculation of tm_yday failed; %s != %s" %
|
|
(result.tm_yday, self.time_tuple.tm_yday))
|
|
|
|
def test_gregorian_calculation(self):
|
|
# Test that Gregorian date can be calculated from Julian day
|
|
format_string = "%Y %H %M %S %w %j %Z"
|
|
result = _strptime.strptime(time.strftime(format_string, self.time_tuple),
|
|
format_string)
|
|
self.failUnless(result.tm_year == self.time_tuple.tm_year and
|
|
result.tm_mon == self.time_tuple.tm_mon and
|
|
result.tm_mday == self.time_tuple.tm_mday,
|
|
"Calculation of Gregorian date failed;"
|
|
"%s-%s-%s != %s-%s-%s" %
|
|
(result.tm_year, result.tm_mon, result.tm_mday,
|
|
self.time_tuple.tm_year, self.time_tuple.tm_mon,
|
|
self.time_tuple.tm_mday))
|
|
|
|
def test_day_of_week_calculation(self):
|
|
# Test that the day of the week is calculated as needed
|
|
format_string = "%Y %m %d %H %S %j %Z"
|
|
result = _strptime.strptime(time.strftime(format_string, self.time_tuple),
|
|
format_string)
|
|
self.failUnless(result.tm_wday == self.time_tuple.tm_wday,
|
|
"Calculation of day of the week failed;"
|
|
"%s != %s" % (result.tm_wday, self.time_tuple.tm_wday))
|
|
|
|
def test_week_of_year_and_day_of_week_calculation(self):
|
|
# Should be able to infer date if given year, week of year (%U or %W)
|
|
# and day of the week
|
|
def test_helper(ymd_tuple, test_reason):
|
|
for directive in ('W', 'U'):
|
|
format_string = "%%Y %%%s %%w" % directive
|
|
dt_date = datetime_date(*ymd_tuple)
|
|
strp_input = dt_date.strftime(format_string)
|
|
strp_output = _strptime.strptime(strp_input, format_string)
|
|
self.failUnless(strp_output[:3] == ymd_tuple,
|
|
"%s(%s) test failed w/ '%s': %s != %s (%s != %s)" %
|
|
(test_reason, directive, strp_input,
|
|
strp_output[:3], ymd_tuple,
|
|
strp_output[7], dt_date.timetuple()[7]))
|
|
test_helper((1901, 1, 3), "week 0")
|
|
test_helper((1901, 1, 8), "common case")
|
|
test_helper((1901, 1, 13), "day on Sunday")
|
|
test_helper((1901, 1, 14), "day on Monday")
|
|
test_helper((1905, 1, 1), "Jan 1 on Sunday")
|
|
test_helper((1906, 1, 1), "Jan 1 on Monday")
|
|
test_helper((1906, 1, 7), "first Sunday in a year starting on Monday")
|
|
test_helper((1905, 12, 31), "Dec 31 on Sunday")
|
|
test_helper((1906, 12, 31), "Dec 31 on Monday")
|
|
test_helper((2008, 12, 29), "Monday in the last week of the year")
|
|
test_helper((2008, 12, 22), "Monday in the second-to-last week of the "
|
|
"year")
|
|
test_helper((1978, 10, 23), "randomly chosen date")
|
|
test_helper((2004, 12, 18), "randomly chosen date")
|
|
test_helper((1978, 10, 23), "year starting and ending on Monday while "
|
|
"date not on Sunday or Monday")
|
|
test_helper((1917, 12, 17), "year starting and ending on Monday with "
|
|
"a Monday not at the beginning or end "
|
|
"of the year")
|
|
test_helper((1917, 12, 31), "Dec 31 on Monday with year starting and "
|
|
"ending on Monday")
|
|
test_helper((2007, 1, 7), "First Sunday of 2007")
|
|
test_helper((2007, 1, 14), "Second Sunday of 2007")
|
|
test_helper((2006, 12, 31), "Last Sunday of 2006")
|
|
test_helper((2006, 12, 24), "Second to last Sunday of 2006")
|
|
|
|
|
|
class CacheTests(unittest.TestCase):
|
|
"""Test that caching works properly."""
|
|
|
|
def test_time_re_recreation(self):
|
|
# Make sure cache is recreated when current locale does not match what
|
|
# cached object was created with.
|
|
_strptime.strptime("10", "%d")
|
|
_strptime.strptime("2005", "%Y")
|
|
_strptime._TimeRE_cache.locale_time.lang = "Ni"
|
|
original_time_re = id(_strptime._TimeRE_cache)
|
|
_strptime.strptime("10", "%d")
|
|
self.failIfEqual(original_time_re, id(_strptime._TimeRE_cache))
|
|
self.failUnlessEqual(len(_strptime._regex_cache), 1)
|
|
|
|
def test_regex_cleanup(self):
|
|
# Make sure cached regexes are discarded when cache becomes "full".
|
|
try:
|
|
del _strptime._regex_cache['%d']
|
|
except KeyError:
|
|
pass
|
|
bogus_key = 0
|
|
while len(_strptime._regex_cache) <= _strptime._CACHE_MAX_SIZE:
|
|
_strptime._regex_cache[bogus_key] = None
|
|
bogus_key += 1
|
|
_strptime.strptime("10", "%d")
|
|
self.failUnlessEqual(len(_strptime._regex_cache), 1)
|
|
|
|
def test_new_localetime(self):
|
|
# A new LocaleTime instance should be created when a new TimeRE object
|
|
# is created.
|
|
locale_time_id = id(_strptime._TimeRE_cache.locale_time)
|
|
_strptime._TimeRE_cache.locale_time.lang = "Ni"
|
|
_strptime.strptime("10", "%d")
|
|
self.failIfEqual(locale_time_id,
|
|
id(_strptime._TimeRE_cache.locale_time))
|
|
|
|
def test_TimeRE_recreation(self):
|
|
# The TimeRE instance should be recreated upon changing the locale.
|
|
locale_info = locale.getlocale(locale.LC_TIME)
|
|
try:
|
|
locale.setlocale(locale.LC_TIME, ('en_US', 'UTF8'))
|
|
except locale.Error:
|
|
return
|
|
try:
|
|
_strptime.strptime('10', '%d')
|
|
# Get id of current cache object.
|
|
first_time_re_id = id(_strptime._TimeRE_cache)
|
|
try:
|
|
# Change the locale and force a recreation of the cache.
|
|
locale.setlocale(locale.LC_TIME, ('de_DE', 'UTF8'))
|
|
_strptime.strptime('10', '%d')
|
|
# Get the new cache object's id.
|
|
second_time_re_id = id(_strptime._TimeRE_cache)
|
|
# They should not be equal.
|
|
self.failIfEqual(first_time_re_id, second_time_re_id)
|
|
# 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.
|
|
except locale.Error:
|
|
pass
|
|
# Make sure we don't trample on the locale setting once we leave the
|
|
# test.
|
|
finally:
|
|
locale.setlocale(locale.LC_TIME, locale_info)
|
|
|
|
|
|
def test_main():
|
|
test_support.run_unittest(
|
|
getlang_Tests,
|
|
LocaleTime_Tests,
|
|
TimeRETests,
|
|
StrptimeTests,
|
|
Strptime12AMPMTests,
|
|
JulianTests,
|
|
CalculationTests,
|
|
CacheTests
|
|
)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
test_main()
|