mirror of
https://github.com/python/cpython.git
synced 2024-12-26 02:04:24 +08:00
cd16bf6404
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. ................
446 lines
19 KiB
Python
446 lines
19 KiB
Python
"""Strptime-related classes and functions.
|
|
|
|
CLASSES:
|
|
LocaleTime -- Discovers and stores locale-specific time information
|
|
TimeRE -- Creates regexes for pattern matching a string of text containing
|
|
time information
|
|
|
|
FUNCTIONS:
|
|
_getlang -- Figure out what language is being used for the locale
|
|
strptime -- Calculates the time struct represented by the passed-in string
|
|
|
|
"""
|
|
import time
|
|
import locale
|
|
import calendar
|
|
from re import compile as re_compile
|
|
from re import IGNORECASE
|
|
from re import escape as re_escape
|
|
from datetime import date as datetime_date
|
|
try:
|
|
from thread import allocate_lock as _thread_allocate_lock
|
|
except:
|
|
from dummy_thread import allocate_lock as _thread_allocate_lock
|
|
|
|
__all__ = ['strptime']
|
|
|
|
def _getlang():
|
|
# Figure out what the current language is set to.
|
|
return locale.getlocale(locale.LC_TIME)
|
|
|
|
class LocaleTime(object):
|
|
"""Stores and handles locale-specific information related to time.
|
|
|
|
ATTRIBUTES:
|
|
f_weekday -- full weekday names (7-item list)
|
|
a_weekday -- abbreviated weekday names (7-item list)
|
|
f_month -- full month names (13-item list; dummy value in [0], which
|
|
is added by code)
|
|
a_month -- abbreviated month names (13-item list, dummy value in
|
|
[0], which is added by code)
|
|
am_pm -- AM/PM representation (2-item list)
|
|
LC_date_time -- format string for date/time representation (string)
|
|
LC_date -- format string for date representation (string)
|
|
LC_time -- format string for time representation (string)
|
|
timezone -- daylight- and non-daylight-savings timezone representation
|
|
(2-item list of sets)
|
|
lang -- Language used by instance (2-item tuple)
|
|
"""
|
|
|
|
def __init__(self):
|
|
"""Set all attributes.
|
|
|
|
Order of methods called matters for dependency reasons.
|
|
|
|
The locale language is set at the offset and then checked again before
|
|
exiting. This is to make sure that the attributes were not set with a
|
|
mix of information from more than one locale. This would most likely
|
|
happen when using threads where one thread calls a locale-dependent
|
|
function while another thread changes the locale while the function in
|
|
the other thread is still running. Proper coding would call for
|
|
locks to prevent changing the locale while locale-dependent code is
|
|
running. The check here is done in case someone does not think about
|
|
doing this.
|
|
|
|
Only other possible issue is if someone changed the timezone and did
|
|
not call tz.tzset . That is an issue for the programmer, though,
|
|
since changing the timezone is worthless without that call.
|
|
|
|
"""
|
|
self.lang = _getlang()
|
|
self.__calc_weekday()
|
|
self.__calc_month()
|
|
self.__calc_am_pm()
|
|
self.__calc_timezone()
|
|
self.__calc_date_time()
|
|
if _getlang() != self.lang:
|
|
raise ValueError("locale changed during initialization")
|
|
|
|
def __pad(self, seq, front):
|
|
# Add '' to seq to either the front (is True), else the back.
|
|
seq = list(seq)
|
|
if front:
|
|
seq.insert(0, '')
|
|
else:
|
|
seq.append('')
|
|
return seq
|
|
|
|
def __calc_weekday(self):
|
|
# Set self.a_weekday and self.f_weekday using the calendar
|
|
# module.
|
|
a_weekday = [calendar.day_abbr[i].lower() for i in range(7)]
|
|
f_weekday = [calendar.day_name[i].lower() for i in range(7)]
|
|
self.a_weekday = a_weekday
|
|
self.f_weekday = f_weekday
|
|
|
|
def __calc_month(self):
|
|
# Set self.f_month and self.a_month using the calendar module.
|
|
a_month = [calendar.month_abbr[i].lower() for i in range(13)]
|
|
f_month = [calendar.month_name[i].lower() for i in range(13)]
|
|
self.a_month = a_month
|
|
self.f_month = f_month
|
|
|
|
def __calc_am_pm(self):
|
|
# Set self.am_pm by using time.strftime().
|
|
|
|
# The magic date (1999,3,17,hour,44,55,2,76,0) is not really that
|
|
# magical; just happened to have used it everywhere else where a
|
|
# static date was needed.
|
|
am_pm = []
|
|
for hour in (1, 22):
|
|
time_tuple = time.struct_time((1999,3,17,hour,44,55,2,76,0))
|
|
am_pm.append(time.strftime("%p", time_tuple).lower())
|
|
self.am_pm = am_pm
|
|
|
|
def __calc_date_time(self):
|
|
# Set self.date_time, self.date, & self.time by using
|
|
# time.strftime().
|
|
|
|
# Use (1999,3,17,22,44,55,2,76,0) for magic date because the amount of
|
|
# overloaded numbers is minimized. The order in which searches for
|
|
# values within the format string is very important; it eliminates
|
|
# possible ambiguity for what something represents.
|
|
time_tuple = time.struct_time((1999,3,17,22,44,55,2,76,0))
|
|
date_time = [None, None, None]
|
|
date_time[0] = time.strftime("%c", time_tuple).lower()
|
|
date_time[1] = time.strftime("%x", time_tuple).lower()
|
|
date_time[2] = time.strftime("%X", time_tuple).lower()
|
|
replacement_pairs = [('%', '%%'), (self.f_weekday[2], '%A'),
|
|
(self.f_month[3], '%B'), (self.a_weekday[2], '%a'),
|
|
(self.a_month[3], '%b'), (self.am_pm[1], '%p'),
|
|
('1999', '%Y'), ('99', '%y'), ('22', '%H'),
|
|
('44', '%M'), ('55', '%S'), ('76', '%j'),
|
|
('17', '%d'), ('03', '%m'), ('3', '%m'),
|
|
# '3' needed for when no leading zero.
|
|
('2', '%w'), ('10', '%I')]
|
|
replacement_pairs.extend([(tz, "%Z") for tz_values in self.timezone
|
|
for tz in tz_values])
|
|
for offset,directive in ((0,'%c'), (1,'%x'), (2,'%X')):
|
|
current_format = date_time[offset]
|
|
for old, new in replacement_pairs:
|
|
# Must deal with possible lack of locale info
|
|
# manifesting itself as the empty string (e.g., Swedish's
|
|
# lack of AM/PM info) or a platform returning a tuple of empty
|
|
# strings (e.g., MacOS 9 having timezone as ('','')).
|
|
if old:
|
|
current_format = current_format.replace(old, new)
|
|
# If %W is used, then Sunday, 2005-01-03 will fall on week 0 since
|
|
# 2005-01-03 occurs before the first Monday of the year. Otherwise
|
|
# %U is used.
|
|
time_tuple = time.struct_time((1999,1,3,1,1,1,6,3,0))
|
|
if '00' in time.strftime(directive, time_tuple):
|
|
U_W = '%W'
|
|
else:
|
|
U_W = '%U'
|
|
date_time[offset] = current_format.replace('11', U_W)
|
|
self.LC_date_time = date_time[0]
|
|
self.LC_date = date_time[1]
|
|
self.LC_time = date_time[2]
|
|
|
|
def __calc_timezone(self):
|
|
# Set self.timezone by using time.tzname.
|
|
# Do not worry about possibility of time.tzname[0] == timetzname[1]
|
|
# and time.daylight; handle that in strptime .
|
|
try:
|
|
time.tzset()
|
|
except AttributeError:
|
|
pass
|
|
no_saving = frozenset(["utc", "gmt", time.tzname[0].lower()])
|
|
if time.daylight:
|
|
has_saving = frozenset([time.tzname[1].lower()])
|
|
else:
|
|
has_saving = frozenset()
|
|
self.timezone = (no_saving, has_saving)
|
|
|
|
|
|
class TimeRE(dict):
|
|
"""Handle conversion from format directives to regexes."""
|
|
|
|
def __init__(self, locale_time=None):
|
|
"""Create keys/values.
|
|
|
|
Order of execution is important for dependency reasons.
|
|
|
|
"""
|
|
if locale_time:
|
|
self.locale_time = locale_time
|
|
else:
|
|
self.locale_time = LocaleTime()
|
|
base = super()
|
|
base.__init__({
|
|
# The " \d" part of the regex is to make %c from ANSI C work
|
|
'd': r"(?P<d>3[0-1]|[1-2]\d|0[1-9]|[1-9]| [1-9])",
|
|
'H': r"(?P<H>2[0-3]|[0-1]\d|\d)",
|
|
'I': r"(?P<I>1[0-2]|0[1-9]|[1-9])",
|
|
'j': r"(?P<j>36[0-6]|3[0-5]\d|[1-2]\d\d|0[1-9]\d|00[1-9]|[1-9]\d|0[1-9]|[1-9])",
|
|
'm': r"(?P<m>1[0-2]|0[1-9]|[1-9])",
|
|
'M': r"(?P<M>[0-5]\d|\d)",
|
|
'S': r"(?P<S>6[0-1]|[0-5]\d|\d)",
|
|
'U': r"(?P<U>5[0-3]|[0-4]\d|\d)",
|
|
'w': r"(?P<w>[0-6])",
|
|
# W is set below by using 'U'
|
|
'y': r"(?P<y>\d\d)",
|
|
#XXX: Does 'Y' need to worry about having less or more than
|
|
# 4 digits?
|
|
'Y': r"(?P<Y>\d\d\d\d)",
|
|
'A': self.__seqToRE(self.locale_time.f_weekday, 'A'),
|
|
'a': self.__seqToRE(self.locale_time.a_weekday, 'a'),
|
|
'B': self.__seqToRE(self.locale_time.f_month[1:], 'B'),
|
|
'b': self.__seqToRE(self.locale_time.a_month[1:], 'b'),
|
|
'p': self.__seqToRE(self.locale_time.am_pm, 'p'),
|
|
'Z': self.__seqToRE((tz for tz_names in self.locale_time.timezone
|
|
for tz in tz_names),
|
|
'Z'),
|
|
'%': '%'})
|
|
base.__setitem__('W', base.__getitem__('U').replace('U', 'W'))
|
|
base.__setitem__('c', self.pattern(self.locale_time.LC_date_time))
|
|
base.__setitem__('x', self.pattern(self.locale_time.LC_date))
|
|
base.__setitem__('X', self.pattern(self.locale_time.LC_time))
|
|
|
|
def __seqToRE(self, to_convert, directive):
|
|
"""Convert a list to a regex string for matching a directive.
|
|
|
|
Want possible matching values to be from longest to shortest. This
|
|
prevents the possibility of a match occuring for a value that also
|
|
a substring of a larger value that should have matched (e.g., 'abc'
|
|
matching when 'abcdef' should have been the match).
|
|
|
|
"""
|
|
to_convert = sorted(to_convert, key=len, reverse=True)
|
|
for value in to_convert:
|
|
if value != '':
|
|
break
|
|
else:
|
|
return ''
|
|
regex = '|'.join(re_escape(stuff) for stuff in to_convert)
|
|
regex = '(?P<%s>%s' % (directive, regex)
|
|
return '%s)' % regex
|
|
|
|
def pattern(self, format):
|
|
"""Return regex pattern for the format string.
|
|
|
|
Need to make sure that any characters that might be interpreted as
|
|
regex syntax are escaped.
|
|
|
|
"""
|
|
processed_format = ''
|
|
# The sub() call escapes all characters that might be misconstrued
|
|
# as regex syntax. Cannot use re.escape since we have to deal with
|
|
# format directives (%m, etc.).
|
|
regex_chars = re_compile(r"([\\.^$*+?\(\){}\[\]|])")
|
|
format = regex_chars.sub(r"\\\1", format)
|
|
whitespace_replacement = re_compile('\s+')
|
|
format = whitespace_replacement.sub('\s+', format)
|
|
while '%' in format:
|
|
directive_index = format.index('%')+1
|
|
processed_format = "%s%s%s" % (processed_format,
|
|
format[:directive_index-1],
|
|
self[format[directive_index]])
|
|
format = format[directive_index+1:]
|
|
return "%s%s" % (processed_format, format)
|
|
|
|
def compile(self, format):
|
|
"""Return a compiled re object for the format string."""
|
|
return re_compile(self.pattern(format), IGNORECASE)
|
|
|
|
_cache_lock = _thread_allocate_lock()
|
|
# DO NOT modify _TimeRE_cache or _regex_cache without acquiring the cache lock
|
|
# first!
|
|
_TimeRE_cache = TimeRE()
|
|
_CACHE_MAX_SIZE = 5 # Max number of regexes stored in _regex_cache
|
|
_regex_cache = {}
|
|
|
|
def _calc_julian_from_U_or_W(year, week_of_year, day_of_week, week_starts_Mon):
|
|
"""Calculate the Julian day based on the year, week of the year, and day of
|
|
the week, with week_start_day representing whether the week of the year
|
|
assumes the week starts on Sunday or Monday (6 or 0)."""
|
|
first_weekday = datetime_date(year, 1, 1).weekday()
|
|
# If we are dealing with the %U directive (week starts on Sunday), it's
|
|
# easier to just shift the view to Sunday being the first day of the
|
|
# week.
|
|
if not week_starts_Mon:
|
|
first_weekday = (first_weekday + 1) % 7
|
|
day_of_week = (day_of_week + 1) % 7
|
|
# Need to watch out for a week 0 (when the first day of the year is not
|
|
# the same as that specified by %U or %W).
|
|
week_0_length = (7 - first_weekday) % 7
|
|
if week_of_year == 0:
|
|
return 1 + day_of_week - first_weekday
|
|
else:
|
|
days_to_week = week_0_length + (7 * (week_of_year - 1))
|
|
return 1 + days_to_week + day_of_week
|
|
|
|
|
|
def strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
|
|
"""Return a time struct based on the input string and the format string."""
|
|
global _TimeRE_cache, _regex_cache
|
|
with _cache_lock:
|
|
if _getlang() != _TimeRE_cache.locale_time.lang:
|
|
_TimeRE_cache = TimeRE()
|
|
_regex_cache.clear()
|
|
if len(_regex_cache) > _CACHE_MAX_SIZE:
|
|
_regex_cache.clear()
|
|
locale_time = _TimeRE_cache.locale_time
|
|
format_regex = _regex_cache.get(format)
|
|
if not format_regex:
|
|
try:
|
|
format_regex = _TimeRE_cache.compile(format)
|
|
# KeyError raised when a bad format is found; can be specified as
|
|
# \\, in which case it was a stray % but with a space after it
|
|
except KeyError as err:
|
|
bad_directive = err.args[0]
|
|
if bad_directive == "\\":
|
|
bad_directive = "%"
|
|
del err
|
|
raise ValueError("'%s' is a bad directive in format '%s'" %
|
|
(bad_directive, format))
|
|
# IndexError only occurs when the format string is "%"
|
|
except IndexError:
|
|
raise ValueError("stray %% in format '%s'" % format)
|
|
_regex_cache[format] = format_regex
|
|
found = format_regex.match(data_string)
|
|
if not found:
|
|
raise ValueError("time data %r does not match format %r" %
|
|
(data_string, format))
|
|
if len(data_string) != found.end():
|
|
raise ValueError("unconverted data remains: %s" %
|
|
data_string[found.end():])
|
|
year = 1900
|
|
month = day = 1
|
|
hour = minute = second = 0
|
|
tz = -1
|
|
# Default to -1 to signify that values not known; not critical to have,
|
|
# though
|
|
week_of_year = -1
|
|
week_of_year_start = -1
|
|
# weekday and julian defaulted to -1 so as to signal need to calculate
|
|
# values
|
|
weekday = julian = -1
|
|
found_dict = found.groupdict()
|
|
for group_key in found_dict.keys():
|
|
# Directives not explicitly handled below:
|
|
# c, x, X
|
|
# handled by making out of other directives
|
|
# U, W
|
|
# worthless without day of the week
|
|
if group_key == 'y':
|
|
year = int(found_dict['y'])
|
|
# Open Group specification for strptime() states that a %y
|
|
#value in the range of [00, 68] is in the century 2000, while
|
|
#[69,99] is in the century 1900
|
|
if year <= 68:
|
|
year += 2000
|
|
else:
|
|
year += 1900
|
|
elif group_key == 'Y':
|
|
year = int(found_dict['Y'])
|
|
elif group_key == 'm':
|
|
month = int(found_dict['m'])
|
|
elif group_key == 'B':
|
|
month = locale_time.f_month.index(found_dict['B'].lower())
|
|
elif group_key == 'b':
|
|
month = locale_time.a_month.index(found_dict['b'].lower())
|
|
elif group_key == 'd':
|
|
day = int(found_dict['d'])
|
|
elif group_key == 'H':
|
|
hour = int(found_dict['H'])
|
|
elif group_key == 'I':
|
|
hour = int(found_dict['I'])
|
|
ampm = found_dict.get('p', '').lower()
|
|
# If there was no AM/PM indicator, we'll treat this like AM
|
|
if ampm in ('', locale_time.am_pm[0]):
|
|
# We're in AM so the hour is correct unless we're
|
|
# looking at 12 midnight.
|
|
# 12 midnight == 12 AM == hour 0
|
|
if hour == 12:
|
|
hour = 0
|
|
elif ampm == locale_time.am_pm[1]:
|
|
# We're in PM so we need to add 12 to the hour unless
|
|
# we're looking at 12 noon.
|
|
# 12 noon == 12 PM == hour 12
|
|
if hour != 12:
|
|
hour += 12
|
|
elif group_key == 'M':
|
|
minute = int(found_dict['M'])
|
|
elif group_key == 'S':
|
|
second = int(found_dict['S'])
|
|
elif group_key == 'A':
|
|
weekday = locale_time.f_weekday.index(found_dict['A'].lower())
|
|
elif group_key == 'a':
|
|
weekday = locale_time.a_weekday.index(found_dict['a'].lower())
|
|
elif group_key == 'w':
|
|
weekday = int(found_dict['w'])
|
|
if weekday == 0:
|
|
weekday = 6
|
|
else:
|
|
weekday -= 1
|
|
elif group_key == 'j':
|
|
julian = int(found_dict['j'])
|
|
elif group_key in ('U', 'W'):
|
|
week_of_year = int(found_dict[group_key])
|
|
if group_key == 'U':
|
|
# U starts week on Sunday.
|
|
week_of_year_start = 6
|
|
else:
|
|
# W starts week on Monday.
|
|
week_of_year_start = 0
|
|
elif group_key == 'Z':
|
|
# Since -1 is default value only need to worry about setting tz if
|
|
# it can be something other than -1.
|
|
found_zone = found_dict['Z'].lower()
|
|
for value, tz_values in enumerate(locale_time.timezone):
|
|
if found_zone in tz_values:
|
|
# Deal with bad locale setup where timezone names are the
|
|
# same and yet time.daylight is true; too ambiguous to
|
|
# be able to tell what timezone has daylight savings
|
|
if (time.tzname[0] == time.tzname[1] and
|
|
time.daylight and found_zone not in ("utc", "gmt")):
|
|
break
|
|
else:
|
|
tz = value
|
|
break
|
|
# If we know the week of the year and what day of that week, we can figure
|
|
# out the Julian day of the year.
|
|
if julian == -1 and week_of_year != -1 and weekday != -1:
|
|
week_starts_Mon = True if week_of_year_start == 0 else False
|
|
julian = _calc_julian_from_U_or_W(year, week_of_year, weekday,
|
|
week_starts_Mon)
|
|
# Cannot pre-calculate datetime_date() since can change in Julian
|
|
# calculation and thus could have different value for the day of the week
|
|
# calculation.
|
|
if julian == -1:
|
|
# Need to add 1 to result since first day of the year is 1, not 0.
|
|
julian = datetime_date(year, month, day).toordinal() - \
|
|
datetime_date(year, 1, 1).toordinal() + 1
|
|
else: # Assume that if they bothered to include Julian day it will
|
|
# be accurate.
|
|
datetime_result = datetime_date.fromordinal((julian - 1) + datetime_date(year, 1, 1).toordinal())
|
|
year = datetime_result.year
|
|
month = datetime_result.month
|
|
day = datetime_result.day
|
|
if weekday == -1:
|
|
weekday = datetime_date(year, month, day).weekday()
|
|
return time.struct_time((year, month, day,
|
|
hour, minute, second,
|
|
weekday, julian, tz))
|