mirror of
https://github.com/python/cpython.git
synced 2025-10-25 15:58:57 +00:00
svn+ssh://pythondev@svn.python.org/python/trunk ........ r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines Do not copy free variables to locals in class namespaces. Fixes bug 1569356, but at the cost of a minor incompatibility in locals(). Add test that verifies that the class namespace is not polluted. Also clarify the behavior in the library docs. Along the way, cleaned up the dict_to_map and map_to_dict implementations and added some comments that explain what they do. ........ r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines Fix assertion. ........ r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines When printing an unraisable error, don't print exceptions. before the name. This duplicates the behavior whening normally printing exceptions. ........ r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line Markup fix ........ r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions are gone. ........ r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line Add some items ........ r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines Fix long-standing bug in name mangling for package imports Reported by Mike Verdone. ........ r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines tabify ........ r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines tabify Note that ast.c still has a mix of tabs and spaces, because it attempts to use four-space indents for more of the new code. ........ r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines whitespace normalization ........ r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines Add checking for a number of metaclass error conditions. We add some new rules that are required for preserving internal invariants of types. 1. If type (or a subclass of type) appears in bases, it must appear before any non-type bases. If a non-type base (like a regular new-style class) occurred first, it could trick type into allocating the new class an __dict__ which must be impossible. 2. There are several checks that are made of bases when creating a type. Those checks are now repeated when assigning to __bases__. We also add the restriction that assignment to __bases__ may not change the metaclass of the type. Add new tests for these cases and for a few other oddball errors that were no previously tested. Remove a crasher test that was fixed. Also some internal refactoring: Extract the code to find the most derived metaclass of a type and its bases. It is now needed in two places. Rewrite the TypeError checks in test_descr to use doctest. The tests now clearly show what exception they expect to see. ........ r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines Add news about changes to metaclasses and __bases__ error checking. ........ r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines Modify the segfaulting example to show why r53997 is not a solution to it. ........ r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines Add a test for instantiating SyntaxError with no arguments. ........ r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line Docstring nit. ........ r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line Prepare collections module for pure python code entries. ........ r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line Add collections.NamedTuple ........ r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line Add Pat and Eric for work on PEP 3101 in the sandbox ........ r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line Add NamedTuple ........ r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines Bug #1628895: some better tries to find HTML documentation in pydoc. ........ r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line Fix embarrassing typo and fix constantification of None ........ r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize. ........ r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines Fix a bug in test_dict and test_userdict, found at the PyPy sprint. ........ r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines Teach setup.py how to find Berkeley DB on Macs using MacPorts. ........ r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line note MacPorts/BerkDB change in setup.py ........ r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line Added Pete for 3101 too ........ r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line Minor corrections to docs, and an explanation comentary ........ r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines Patch #1674228: when assigning a slice (old-style), check for the sq_ass_slice instead of the sq_slice slot. ........ r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines Nit: a struct field is set to GenericAlloc, not GenericAlloc(). ........ r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1671450: add a section about subclassing builtin types to the "extending and embedding" tutorial. ........ r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1121142: Implement ZipFile.open. ........ r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the fix in #1674228. ........ r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1672481: fix bug in idlelib.MultiCall. ........ r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line Bug #1674503: close the file opened by execfile() in an error condition. ........ r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines Fix another reincarnation of bug #1576657 in defaultdict. ........ r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines A test case for the defaultdict KeyError bug. ........ r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1663234: you can now run doctest on test files and modules using "python -m doctest [-v] filename ...". ........ r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #912410: Replace HTML entity references for attribute values in HTMLParser. ........ r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line patch 1673619 - identify extension modules which cannot be built ........ r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines Patch #1646728: datetime.fromtimestamp fails with negative fractional times. With unittest. Somebody please backport to 2.5. ........ r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines Fix cmp vs. key argument for list.sort. ........ r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines Small nit, found by Neal. ........ r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1602128: clarify that richcmp methods can return NotImplemented and should return True or False otherwise. ........ r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1638879: don't accept strings with embedded NUL bytes in long(). ........ r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #1673121: update README wrt. OSX default shell. ........ r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines Patch #1654417: make operator.{get,set,del}slice use the full range of Py_ssize_t. ........ r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines Patch for bug #1633621: if curses.resizeterm() or curses.resize_term() is called, update _curses.LINES, _curses.COLS, curses.LINES and curses.COLS. ........ r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines Document change to curses. ........ r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines Variant of patch #697613: don't exit the interpreter on a SystemExit exception if the -i command line option or PYTHONINSPECT environment variable is given, but break into the interactive interpreter just like on other exceptions or normal program exit. (backport) ........ r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines Patch #703779: unset __file__ in __main__ after running a file. This makes the filenames the warning module prints much more sensible when a PYTHONSTARTUP file is used. ........ r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines add versionadded info ........ r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler. ........ r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #1001604: glob.glob() now returns unicode filenames if it was given a unicode argument and os.listdir() returns unicode filenames. ........ r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines Patches #1550273, #1550272: fix a few bugs in unittest and add a comprehensive test suite for the module. ........ r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines Patch #787789: allow to pass custom TestRunner instances to unittest's main() function. ........ r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position. ........ r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', ''). ........ r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines Patch #1675471: convert test_pty to unittest. ........ r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines Add some sanity checks to unittest.TestSuite's addTest(s) methods. Fixes #878275. ........ r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines Windows doesn't support negative timestamps. Skip the tests involving them if os.name == "nt". ........ r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines Add missing ) in parenthical remark. ........ r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines Fix #1676656: \em is different from \emph... ........ r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines Add a NEWS entry for rev. 54207,8. ........ r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line SF 1676321: empty() returned wrong result ........ r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order. ........ r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line SF #1637850: make_table in difflib did not work with unicode ........ r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1668482: don't use '-' in mkstemp ........ r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines Introduce test.test_support.TransientResource. It's a context manager to surround calls to resources that may or may not be available. Specifying the expected exception and attributes to be raised if the resource is not available prevents overly broad catching of exceptions. This is meant to help suppress spurious failures by raising test.test_support.ResourceDenied if the exception matches. It would probably be good to go through the various network tests and surround the calls to catch connection timeouts (as done with test_socket_ssl in this commit). ........ r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py ........ r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line Add NEWS item for patch #1481079 (r54234). ........ r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line Fix SF #1676971, Complex OverflowError has a typo ........ r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines Typo. ........ r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #957003: Implement smtplib.LMTP. ........ r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822. ........ r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0) returned string up to the first NUL character. ........ r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines Add Ziga Seilnacht. ........ r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError. ........ r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines Bug #1651235: When a tuple was passed to a ctypes function call, Python would crash instead of raising an error. The crash was caused by a section of code that should have been removed long ago, at that time ctypes had other ways to pass parameters to function calls. ........ r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line Hashing simplification pointed out by Thomas Wouters. ........ r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines * Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink. * Drop safe_remove() in favor of test_support.unlink(). * Fix the indentation of test_samefile so that it runs. ........ r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket. Will backport. ........ r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines Simplify a little by handling the TCP case first. Update to use predominant style of spaces around = in args list and print to stderr if debugging. ........ r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line Add proper attribution for a bug fix. ........ r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines Typos. ........ r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line Convert an assert to a raise so it works even in the presence of -O. ........ r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer. ........ r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines Add missing "return" statements in exception handler. ........ r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1675981: remove unreachable code from type.__new__() method. __dict__ and __weakref__ are removed from the slots tuple earlier in the code, in the loop that mangles slot names. Will backport. ........ r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number. Will backport. ........ r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line Fix resource leak reported in SF #1516995. ........ r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more stable FTP. Will backport. ........ r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the display name of an email address, e.g. Foo \tBar <foo@example.com> Test case added by Barry. ........ r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines Sane humans would call these invalid tests, but Andrew McNamara pointed out that given the inputs in these tests Excel does indeed produce the output these tests expect. Document that for future confused folks. ........ r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86. ........ r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines Patch #1677862: Require a space or tab after import in .pth files. ........ r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines Backport from Py3k branch: Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir. Had to change a few bits of the patch because classobjs and __methods__ are still in Py2.6. ........ r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #1678647: write a newline after printing an exception in any case, even when converting the value to a string failed. ........ r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1678088: convert test_operations to use unittest, fold the result into test_dict. ........ r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167. Will backport. ........ r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines Typo fix. ........ r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line Patch #1670993: Refactor test_threadedtempfile.py to use unittest. ........ r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines Whitespace normalization. ........ r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines Add test.test_support.transient_internet . Returns a context manager that nests test.test_support.TransientResource context managers that capture exceptions raised when the Internet connection is flaky. Initially using in test_socket_ssl but should probably be expanded to cover any test that should not raise the captured exceptions if the Internet connection works. ........ r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines Fix a typo where the variable name was not updated. ........ r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line Add Jerry Seutter for a bunch of his recent patches refactoring tests ........ r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines Add some other acks for recent checkins: Brian Leair - 922167 Tomer Filiba - 1591665 Jeremy Jones - 1192590 ........ r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines Fix some style nits: * lines too long * wrong indentation * space after a function name * wrong function name in error string * simplifying some logic Also add an error check to PyDict_SetItemString. ........ r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines Typo and grammar fixes. ........ r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1679379: add documentation for fnmatch.translate(). ........ r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1642844: comments to clarify the complexobject constructor. ........ r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1668100: urllib2 now correctly raises URLError instead of OSError if accessing a local file via the file:// protocol fails. ........ r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1635454: the csv.DictWriter class now includes the offending field names in its exception message if you try to write a record with a dictionary containing fields not in the CSV field names list. ........ r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1555098: use str.join() instead of repeated string concatenation in robotparser. ........ r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to pydoc's help keywords. ........ r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1569798: fix a bug in distutils when building Python from a directory within sys.exec_prefix. ........ r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1449244: Support Unicode strings in email.message.Message.{set_charset,get_content_charset}. Will backport. ........ r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines This is the implementation of POSIX.1-2001 (pax) format read/write support. The TarInfo class now contains all necessary logic to process and create tar header data which has been moved there from the TarFile class. The fromtarfile() method was added. The new path and linkpath properties are aliases for the name and linkname attributes in correspondence to the pax naming scheme. The TarFile constructor and classmethods now accept a number of keyword arguments which could only be set as attributes before (e.g. dereference, ignore_zeros). The encoding and pax_headers arguments were added for pax support. There is a new tarinfo keyword argument that allows using subclassed TarInfo objects in TarFile. The boolean TarFile.posix attribute is deprecated, because now three tar formats are supported. Instead, the desired format for writing is specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT as the format keyword argument. This change affects TarInfo.tobuf() as well. The test suite has been heavily reorganized and partially rewritten. A new testtar.tar was added that contains sample data in many formats from 4 different tar programs. Some bugs and quirks that also have been fixed: Directory names do no longer have a trailing slash in TarInfo.name or TarFile.getnames(). Adding the same file twice does not create a hardlink file member. The TarFile constructor does no longer need a name argument. The TarFile._mode attribute was renamed to mode and contains either 'r', 'w' or 'a'. ........ r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines Bug #1622896: fix a rare corner case where the bz2 module raised an error in spite of a succesful compression. ........ r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines Quick fix for tests that fail on systems with an encoding other than 'iso8859-1'. ........ r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1603688: ConfigParser.SafeConfigParser now checks values that are set for invalid interpolation sequences that would lead to errors on reading back those values. ........ r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1581073: add a flag to textwrap that prevents the dropping of whitespace while wrapping. ........ r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1605192: list allowed states in error messages for imaplib. ........ r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter which can be set to False to prevent the default delete-on-close behavior. ........ r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines Add acks for recent patch checkins: Arvin Schnell - 1668482 S?\195?\169bastien Martini - 1481079 Heiko Wundram - 1491866 Damon Kohler - 1545011 Peter Parente - 1599845 Bjorn Lindqvist - 1678662 ........ r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines Acks for recent patches. ........ r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines Fix a tab. ........ r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1533909: the timeit module now accepts callables in addition to strings for the code to time and the setup code. Also added two convenience functions for instantiating a Timer and calling its methods. ........ r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1530482: add pydoc.render_doc() which returns the documentation for a thing instead of paging it to stdout, which pydoc.doc() does. ........ r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. ........ r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1444529: the builtin compile() now accepts keyword arguments. (backport) ........ r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line Add versionadded marker for ctypes.c_bool. ........ r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines Patch #1393667: pdb now has a "run" command which restarts the debugged Python program, optionally with different arguments. ........ r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines Deprecate commands.getstatus(). ........ r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines NEWS entry for getstatus() deprecation. ........ r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #1429539: pdb now correctly initializes the __main__ module for the debugged script, which means that imports from __main__ work correctly now. ........ r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines Patch #957650: "%var%" environment variable references are now properly expanded in ntpath.expandvars(), also "~user" home directory references are recognized and handled on Windows. ........ r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines Patch #1194449: correctly detect unbound methods in pydoc. ........ r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters with ASCII value less than 32. Also, it correctly quotes dots only if they occur on a single line, as opposed to the previous behavior of quoting dots if they are the second character of any line. ........ r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line Inline PyImport_GetModulesReloading(). ........ r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines SF bug #1582282; decode_header() incorrectly splits not-conformant RFC 2047-like headers where there is no whitespace between encoded words. This fix changes the matching regexp to include a trailing lookahead assertion that the closing ?= must be followed by whitespace, newline, or end-of-string. This also changes the regexp to add the MULTILINE flag. ........ r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines correct order and names of the less often used keyword parameters. ........ r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9" now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform items are all OS X special API specific since OS X is unixy enough for these modules to be available out of the box. ........ r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines Bug #767111: fix long-standing bug in urllib which caused an AttributeError instead of an IOError when the server's response didn't contain a valid HTTP status line. ........ r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines Patch #1680015: Don't modify __slots__ tuple if it contains an unicode name. Remove a reference leak that happened if the name could not be converted to string. Will backport. ........ r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines Patch #1559413: Fix test_cmd_line if sys.executable contains a space. Will backport. ........ r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines Note how test_socket_ssl has various exceptions that deal with a flaky Net connection are silenced. ........ r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines Raise ResourceDenied in test_urllib2net when the Net connection goes bad. ........ r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line Wrap a long line and fix a typo (is -> if) ........ r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1680978: consistently use "alive" instead of "active" in the thread lib doc. ........ r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1681153: the wave module now closes a file object it opened if initialization failed. ........ r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1462488: prevent a segfault in object_reduce_ex() by splitting the implementation for __reduce__ and __reduce_ex__ into two separate functions. Fixes bug #931877. Will backport. ........ r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Will backport. ........ r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines Bug #1681228: the webbrowser module now correctly uses the default GNOME or KDE browser, depending on whether there is a session of one of those present. Also, it tries the Windows default browser before trying Mozilla variants. (backport) ........ r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines Patch #1273829: os.walk() now has a "followlinks" parameter. If set to True (which is not the default), it visits symlinks pointing to directories. ........ r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines Add \versionadded tag. ........ r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines RFE #1670167: fix in isinstance() docs. ........ r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines Patch #1623563: allow __class__ assignment for classes with __slots__. The old and the new class are still required to have the same slot names, but the order in which they are specified is not relevant. ........ r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines Whitespace cleanup. Also remove the empty lines from the previous check in. ........ r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines Remove warning: funcion declaration isn't a prototype ........ r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines Clean up formatting of this file. The file should now follow PEP 7, except that it uses 4 space indents (in the style of Py3k). This particular code would be really hard to read with the regular tab idents. Other changes: - reflow long lines - change multi-line conditionals to have test at end of line ........ r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line Patch #1676994: Refactor test_popen2 to use unittest. ........ r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line Remove test/output/test_popen2 (missed in r54417). ........ r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line Patch 1339796: add a relpath() function to os.path. ........ r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines Patch #1675423: PyComplex_AsCComplex() now tries to convert an object to complex using its __complex__() method before falling back to the __float__() method. Therefore, the functions in the cmath module now can operate on objects that define a __complex__() method. (backport) ........ r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines move note to the correct section ........ r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf. ........ r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines Patch #1678339: test case for bug in difflib. ........ r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line Patch #1630118: add a SpooledTemporaryFile class to tempfile. ........ r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines Patch #1683328: fixes and enhancements for "unparse" demo. ........ r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line Add some doc that was left out from some change to platform.py ........ r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line Add a comment about 3k migration ........ r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line Get rid of deprecation warning when testing commands.getstatus() ........ r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines Try backing out 54407 to see if it corrects the problems on the Windows buildbots. This rev was backported, so we will need to keep both branches in sync, pending the outcome of the test after this checkin. ........ r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-) ........ r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines Try to be a little more resilient to errors. This might help the test pass, but my guess is that it won't. I'm guessing that some other test is leaving this file open which means it can't be removed under Windows AFAIK. ........ r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines Try to get test_urllib to pass on Windows by closing the file. I'm guessing that's the problem. h.getfile() must be called *after* h.getreply() and the fp can be None. I'm not entirely convinced this is the best fix (or even correct). The buildbots will tell us if things improve or not. I don't know if this needs to be backported (assuming it actually works). ........ r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. ........ r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines Fix for glob.py if filesystem encoding is None. ........ r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line Remove unused file spotted by Paul Hankin ........ r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines Patch #1682205: a TypeError while unpacking an iterable is no longer masked by a generic one with the message "unpack non-sequence". ........ r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines New test for rev. 54407 which only uses directories under TESTFN. ........ r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines Patch #1684834: document some utility C API functions. ........ r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'. ........ r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line Add comments on maintenance of this file ........ r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line Fix sentence, and fix typo in example ........ r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line Put code examples at left margin instead of indenting them ........ r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line Minor clarification, saying that blocking means no timeout (from bug #882297) ........ r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines Bug #1675967: re patterns pickled with older Python versions can now be unpickled. Will backport. ........ r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line Add test and fix for fromkeys() optional argument. ........ r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines Bug #1685704: use -m switch in timeit docs. ........ r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines Back out "Patch #1643874: memory leak in ctypes fixed." The code in this patch leaves no way to give up the ownership of a BSTR instance. ........ r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines Explain the purpose of the b_needsfree flag (forward ported from release25-maint). ........ r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines - Bug #1683368: The object.__init__() and object.__new__() methods are now stricter in rejecting excess arguments. The only time when either allows excess arguments is when it is not overridden and the other one is. For backwards compatibility, when both are overridden, it is a deprecation warning (for now; maybe a Py3k warning later). When merging this into 3.0, the warnings should become errors. Note: without the change to string.py, lots of spurious warnings happen. What's going on there? ........ r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line Add Mark Dickinson for SF # 1675423. ........ r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}. Will backport. ........ r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines Bug #978833: Revert r50844, as it broke _socketobject.dup. Will backport. ........ r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines Add a type.__init__() method that enforces the same signature as type.__new__(), and then calls object.__init__(cls), just to be anal. This allows us to restore the code in string.py's _TemplateMetaclass that called super(...).__init__(name, bases, dct), which I commented out yesterday since it broke due to the stricter argument checking added to object.__init__(). ........ r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines Added a 'create_connect()' function to socket.py, which creates a connection with an optional timeout, and modified httplib.py to use this function in HTTPConnection. Applies patch 1676823. ........ r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines Add note about type.__init__(). ........ r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines Prevent creation (followed by a segfault) of array types when the size overflows the valid Py_ssize_t range. Check return values of PyMem_Malloc. Will backport to release25-maint. ........ r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines Surrounded with try/finally to socket's default timeout setting changes in the tests, so failing one test won't produce strange results in others. Also relaxed the timeout settings in the test (where actually the value didn't mean anything). ........ r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line Make test_relpath() pass on Windows. ........ r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines Patch #1489771: update syntax rules in Python Reference Manual. Python 2.5 added support for explicit relative import statements and yield expressions, which were missing in the manual. Also fix grammar productions that used the names from the Grammar file, markup that broke the generated grammar.txt, and wrap some lines that broke the pdf output. Will backport. ........ r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines Remove typo accent. ........ r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines Revert accidental change. ........ r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines Change the docs to no longer claim that unittest is preferred over doctest for regression tests. ........ r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines Redone the tests, using the infrastructure already present for threading and socket serving. ........ r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines Closing the HTTP connection after each test, and listening more. ........ r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines Markup fix. ........ r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines Added an optional timeout to FTP class. Also I started a test_ftplib.py file to test the ftp lib (right now I included a basic test, the timeout one, and nothing else). ........ r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines Some nits. ........ r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines Forgot to add the file before the previous commit, here go the ftplib tests. ........ r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines Added an optional timeout to poplib.POP3. Also created a test_poplib.py file with a basic test and the timeout ones. Docs are also updated. ........ r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines The basic test cases of poplib.py. ........ r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines Bug 1688393. Adds a control of negative values in socket.recvfrom, which caused an ugly crash. ........ r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines Added timeout to smtplib (to SMTP and SMTP_SSL). Also created the test_smtplib.py file, with a basic test and the timeout ones. Docs are updated too. ........ r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file. Thanks to Jerry Seutter for all three patches. ........ r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line Make test_zipfile clean up its temporary files properly. ........ r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines These are actually methods. ........ r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines In Windows' time.clock(), when QueryPerformanceFrequency() fails, the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC as for the POSIX implementation (thanks to #pypy). ........ r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines Added timout parameter to telnetlib.Telnet. Also created test_telnetlib.py with a basic test and timeout ones. Docs are also updated. ........ r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines Added the posibility to pass the timeout to FTP.connect, not only when instantiating the class. Docs and tests are updated. ........ r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line Bug #1688274: add documentation for C-level class objects. ........ r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines Bump the patch level version of distutils since there were a few bug fixes since the 2.5.0 release. ........ r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines Label name fix. ........ r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line Add item. (Oops, accidentally checked this in on my branch) ........ r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines Duplicate label fix. ........ r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines Markup fix. ........ r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines repair string literal. ........ r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines Markup fix. ........ r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines Duplicate label fix. ........ r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines Typo fix. ........ r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line Fix method names. Will backport. ........ r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS returned by python-config if Python was built with --enable-shared because that prevented the shared library from being used. ........ r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line Shut up an occaisonal buildbot error due to test files being left around. ........ r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines SF #1685563, MSVCCompiler creates redundant and long PATH strings If MSVCCompiler.initialize() was called multiple times, the path would get duplicated. On Windows, this is a problem because the path is limited to 4k. There's no benefit in adding a path multiple times, so prevent that from occuring. We also normalize the path before checking for duplicates so things like /a and /a/ won't both be stored. Will backport. ........ r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines time.strptime's caching of its locale object was being recreated when the locale changed but not used during the function call it was recreated during. The test in this checkin is untested (OS X does not have the proper locale support for me to test), although the fix for the bug this deals with was tested by the OP (#1290505). Once the buildbots verify the test at least doesn't fail it becomes a backport candidate. ........ r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines Fix the test for recreating the locale cache object by not worrying about if one of the test locales cannot be set. ........ r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines Fix a lot of markup and meta-information glitches. ........ r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines Another fix. ........ r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines Lots of explicit class names for method and member descs. ........ r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines Explicit class names. ........ r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines Some semantic fixes. ........ r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines Remove bogus entry. ........ r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines Fix the class name of strings. ........ r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line SF #1693079: Cannot save empty array in shelve ........ r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines Array module's buffer interface can now handle empty arrays. ........ r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines Fix warnings about object.__init__() signature. Two (test_array and test_descr) were bug IMO; the third (copy_reg) is a work-around which recognizes that object.__init__() doesn't do anything. ........ r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line SF 1602378 Clarify docstrings for bisect ........ r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes ........ r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines - Fix an off-by-one bug in locale.strxfrm(). patch taken from http://bugs.debian.org/416934. ........ r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines Fix the strange case of \begin{methoddesc}[NNTP]{...} where \ifx#1\@undefined ended up comparing N and N, therefore executing the true part of the conditional, blowing up at \@undefined. ........ r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines Now using unittest for the tests infraestructure. Also split the tests in those who need the network, and that who doesn't. ........ r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines Move the functionality for catching warnings in test_warnings.py into a separate class to that reusing the functionality in test_structmembers.py doesn't rerun the tests from test_warnings.py. ........ r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines Document that CatchWarningTests is reused by test_structmembers.py. ........ r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines Add tests for the filename. Test that the stacklevel is handled correctly. ........ r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines Added a SSL server to test_socket_ssl.py to be able to test locally. Now, it checks if have openssl available and run those specific tests (it starts openssl at the beggining of all the tests and then kills it at the end). ........ r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines Implement a contextmanager test.test_support.catch_warning that can be used to catch the last warning issued by the warning framework. Change test_warnings.py and test_structmembers.py to use this new contextmanager. ........ r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines Changed the whole structure of startup and checking if the server is available. Hope to not get more false alarms. ........ r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines Fixed the way that the .pem files are looked for, and changed how to kill the process in win32 to use the _handle attribute. ........ r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines Fix a race condition in this test -- instead of assuming that it will take the test server thread at most 0.5 seconds to get ready, use an event variable. ........ r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line Clean up imports. ........ r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line Stop using test_support.verify(). ........ r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines Bug #1686475: Support stat'ing open files on Windows again. Will backport to 2.5. ........ r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line Make test_getopt use unittest. ........ r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line Make test_softspace use unittest. ........ r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines Fix WalkTests.test_traversal() on Windows. The cleanup in MakedirTests.setUp() can now be removed. ........ r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines Bug #1563759: struct.unpack doens't support buffer protocol objects ........ r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_long_future to use unittest. ........ r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line Convert test_normalization to use unittest. ........ r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line Some grammar fixes ........ r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_stringprep to use unittest. ........ r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line Import cleanup in test_crypt. ........ r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_gc to use unittest. ........ r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_module to use unittest. ........ r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line Convert test_fileinput to use unittest. ........ r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines Doc that file.next() has undefined behaviour when called on a file opened with 'w'. Closes bug #1569057. To be backported once 2.5 branch is unfrozen. ........ r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line Added optional timeout to SocketHandler.makeSocket (SF #1695948) ........ r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines Patch #1695862: remove old test directory that causes test_urllib failures on Windows buildbots. The change is a one time fix and will be removed after a successful buildbot run. ........ r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines Minor fix to the tests pass ok even with -O. ........ r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line Typo fix. ........ r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines General clean-up. Lot of margin corrections, comments, some typos. Exceptions now are raised in the new style. And a mockup class is now also new style. Thanks Santiago Pereson. ........ r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines Repair a duplicate label and some obsolete uses of \setindexsubitem. ........ r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line Add window.chgat() method, submitted via e-mail by Fabian Kreutz ........ r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line Point readers at the patch submission instructions ........ r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line Describe undocumented third argument to touchline() ........ r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines Add some missing NULL checks which trigger crashes on low-memory conditions. Found by Victor Stinner. Will backport when 2.5 branch is unfrozen. ........ r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line SF 1191699: Make slices picklable ........ r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines Exceptions are no longer old-style instances. Fix accordingly. ........ r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines Repair missing spaces after \UNIX. ........ r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line SF 1193128: Let str.translate(None) be an identity transformation ........ r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1698951: clarify deprecation message in rexec and Bastion ........ r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines Patch #1695862: remove the cleanup code, now that Windows buildbots are green again. ........ r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the first chunk fed to the decoder started with a BOM, but was longer than 3 bytes. ........ r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines Port r54805 from python25-maint branch: Add code to read from master_fd in the parent, breaking when we get an OSError (EIO can occur on Linux) or there's no more data to read. Without this, test_pty.py can hang on the waitpid() because the child is blocking on the stdout write. This will definitely happen on Mac OS X and could potentially happen on other platforms. See the comment for details. ........ r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127 ........ r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line Fix potential crash in path manipulation on windows ........ r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore' is built before '_ctypes' is attempted. Will backport to 2.5 once it is unfrozen for 2.5.1. ........ r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines When __slots__ are set to a unicode string, make it work the same as setting a plain string, ie don't expand to single letter identifiers. ........ r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line SF #1701207, Fix bogus assertion (and test it!) ........ r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line Check the availability of the urlfetch resource earlier than before. ........ r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines Add Travis Oliphant. ........ r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines Silence a compiler warning about incompatible pointer types. ........ r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines SF #1703270, add missing declaration in readline.c to avoid compiler warning. ........ r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines Revert r53997 as per http://mail.python.org/pipermail/python-dev/2007-March/071796.html . I've kept a couple of still-valid extra tests in test_descr, but didn't bother to sort through the new comments and refactorings added in r53997 to see if some of them could be kept. If so, they could go in a follow-up check-in. ........ r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines Fix a usage of the dangerous pattern decref - modify field - incref. ........ r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines Add an optional address to copy the failure mails to. Detect a conflict in the only file that should have outstanding changes when this script is run. This doesn't matter on the trunk, but does when run on a branch. Trunk always has the date set to today in boilerplate.tex. Each time a release is cut with a different date, a conflict occurs. (We could copy a known good version, but then we would lose changes to this file.) ........ r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines Bug #1704790: bind name "sys" locally in __del__ method so that it is not cleared before __del__ is run. ........ r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines Added tests for other methods of SSL object. Now we cover all the object methods. This is the final step to close the #451607 bug. ........ r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines As specified in RFC 2616, 2xx code indicates that the client's request was successfully received, understood, and accepted. Now in these cases no error is raised. Also fixed tests. ........ r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line Convert PyUnit -> unittest. ........ r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line Remove code that hasn't been called in years. ........ r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line Fix SF #1703110, Incorrect example for add_password() (use uri, not host) ........ r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines Some new year updates. ........ r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines Added a comment about last change in urllib2.py (all 2xx responses are ok now). ........ r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines Bug #1705717: error in sys.argv docs. ........ r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file (as opposed to the command line) will now write file names ending in ".cpp" too. ........ r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line Fix markup ........ r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition ........ r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h ........ r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now. ........ r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines Patch #1698768: updated the "using Python on the Mac" intro. ........ r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines Markup fix. ........ r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines Whitespace normalization. Ugh, we really need to do this more often. You might want to review this change as it's my first time. Be gentle. :-) ........ r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule(). ........ r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing. ........ r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line Change test_support.have_unicode to use True/False instead of 1/0. ........ r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines Whitespace normalization. ........ r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines Set missing svn:eol-style property on text files. ........ r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line Import and raise statement cleanup. ........ r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line Convert test_ossaudiodev to use unittest. ........ r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line Fix an issue related to the unittest conversion. ........ r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line fix some markup errors ........ r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile. ........ r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build ........ r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line Minor wording change on slicing aide-memoire. ........ r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line Accomodate 64 bit time_t in the _bsddb module. ........
4933 lines
133 KiB
C
4933 lines
133 KiB
C
/* C implementation for the date/time type documented at
|
|
* http://www.zope.org/Members/fdrake/DateTimeWiki/FrontPage
|
|
*/
|
|
|
|
#include "Python.h"
|
|
#include "modsupport.h"
|
|
#include "structmember.h"
|
|
|
|
#include <time.h>
|
|
|
|
#include "timefuncs.h"
|
|
|
|
/* Differentiate between building the core module and building extension
|
|
* modules.
|
|
*/
|
|
#define Py_BUILD_CORE
|
|
#include "datetime.h"
|
|
#undef Py_BUILD_CORE
|
|
|
|
/* We require that C int be at least 32 bits, and use int virtually
|
|
* everywhere. In just a few cases we use a temp long, where a Python
|
|
* API returns a C long. In such cases, we have to ensure that the
|
|
* final result fits in a C int (this can be an issue on 64-bit boxes).
|
|
*/
|
|
#if SIZEOF_INT < 4
|
|
# error "datetime.c requires that C int have at least 32 bits"
|
|
#endif
|
|
|
|
#define MINYEAR 1
|
|
#define MAXYEAR 9999
|
|
|
|
/* Nine decimal digits is easy to communicate, and leaves enough room
|
|
* so that two delta days can be added w/o fear of overflowing a signed
|
|
* 32-bit int, and with plenty of room left over to absorb any possible
|
|
* carries from adding seconds.
|
|
*/
|
|
#define MAX_DELTA_DAYS 999999999
|
|
|
|
/* Rename the long macros in datetime.h to more reasonable short names. */
|
|
#define GET_YEAR PyDateTime_GET_YEAR
|
|
#define GET_MONTH PyDateTime_GET_MONTH
|
|
#define GET_DAY PyDateTime_GET_DAY
|
|
#define DATE_GET_HOUR PyDateTime_DATE_GET_HOUR
|
|
#define DATE_GET_MINUTE PyDateTime_DATE_GET_MINUTE
|
|
#define DATE_GET_SECOND PyDateTime_DATE_GET_SECOND
|
|
#define DATE_GET_MICROSECOND PyDateTime_DATE_GET_MICROSECOND
|
|
|
|
/* Date accessors for date and datetime. */
|
|
#define SET_YEAR(o, v) (((o)->data[0] = ((v) & 0xff00) >> 8), \
|
|
((o)->data[1] = ((v) & 0x00ff)))
|
|
#define SET_MONTH(o, v) (PyDateTime_GET_MONTH(o) = (v))
|
|
#define SET_DAY(o, v) (PyDateTime_GET_DAY(o) = (v))
|
|
|
|
/* Date/Time accessors for datetime. */
|
|
#define DATE_SET_HOUR(o, v) (PyDateTime_DATE_GET_HOUR(o) = (v))
|
|
#define DATE_SET_MINUTE(o, v) (PyDateTime_DATE_GET_MINUTE(o) = (v))
|
|
#define DATE_SET_SECOND(o, v) (PyDateTime_DATE_GET_SECOND(o) = (v))
|
|
#define DATE_SET_MICROSECOND(o, v) \
|
|
(((o)->data[7] = ((v) & 0xff0000) >> 16), \
|
|
((o)->data[8] = ((v) & 0x00ff00) >> 8), \
|
|
((o)->data[9] = ((v) & 0x0000ff)))
|
|
|
|
/* Time accessors for time. */
|
|
#define TIME_GET_HOUR PyDateTime_TIME_GET_HOUR
|
|
#define TIME_GET_MINUTE PyDateTime_TIME_GET_MINUTE
|
|
#define TIME_GET_SECOND PyDateTime_TIME_GET_SECOND
|
|
#define TIME_GET_MICROSECOND PyDateTime_TIME_GET_MICROSECOND
|
|
#define TIME_SET_HOUR(o, v) (PyDateTime_TIME_GET_HOUR(o) = (v))
|
|
#define TIME_SET_MINUTE(o, v) (PyDateTime_TIME_GET_MINUTE(o) = (v))
|
|
#define TIME_SET_SECOND(o, v) (PyDateTime_TIME_GET_SECOND(o) = (v))
|
|
#define TIME_SET_MICROSECOND(o, v) \
|
|
(((o)->data[3] = ((v) & 0xff0000) >> 16), \
|
|
((o)->data[4] = ((v) & 0x00ff00) >> 8), \
|
|
((o)->data[5] = ((v) & 0x0000ff)))
|
|
|
|
/* Delta accessors for timedelta. */
|
|
#define GET_TD_DAYS(o) (((PyDateTime_Delta *)(o))->days)
|
|
#define GET_TD_SECONDS(o) (((PyDateTime_Delta *)(o))->seconds)
|
|
#define GET_TD_MICROSECONDS(o) (((PyDateTime_Delta *)(o))->microseconds)
|
|
|
|
#define SET_TD_DAYS(o, v) ((o)->days = (v))
|
|
#define SET_TD_SECONDS(o, v) ((o)->seconds = (v))
|
|
#define SET_TD_MICROSECONDS(o, v) ((o)->microseconds = (v))
|
|
|
|
/* p is a pointer to a time or a datetime object; HASTZINFO(p) returns
|
|
* p->hastzinfo.
|
|
*/
|
|
#define HASTZINFO(p) (((_PyDateTime_BaseTZInfo *)(p))->hastzinfo)
|
|
|
|
/* M is a char or int claiming to be a valid month. The macro is equivalent
|
|
* to the two-sided Python test
|
|
* 1 <= M <= 12
|
|
*/
|
|
#define MONTH_IS_SANE(M) ((unsigned int)(M) - 1 < 12)
|
|
|
|
/* Forward declarations. */
|
|
static PyTypeObject PyDateTime_DateType;
|
|
static PyTypeObject PyDateTime_DateTimeType;
|
|
static PyTypeObject PyDateTime_DeltaType;
|
|
static PyTypeObject PyDateTime_TimeType;
|
|
static PyTypeObject PyDateTime_TZInfoType;
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Math utilities.
|
|
*/
|
|
|
|
/* k = i+j overflows iff k differs in sign from both inputs,
|
|
* iff k^i has sign bit set and k^j has sign bit set,
|
|
* iff (k^i)&(k^j) has sign bit set.
|
|
*/
|
|
#define SIGNED_ADD_OVERFLOWED(RESULT, I, J) \
|
|
((((RESULT) ^ (I)) & ((RESULT) ^ (J))) < 0)
|
|
|
|
/* Compute Python divmod(x, y), returning the quotient and storing the
|
|
* remainder into *r. The quotient is the floor of x/y, and that's
|
|
* the real point of this. C will probably truncate instead (C99
|
|
* requires truncation; C89 left it implementation-defined).
|
|
* Simplification: we *require* that y > 0 here. That's appropriate
|
|
* for all the uses made of it. This simplifies the code and makes
|
|
* the overflow case impossible (divmod(LONG_MIN, -1) is the only
|
|
* overflow case).
|
|
*/
|
|
static int
|
|
divmod(int x, int y, int *r)
|
|
{
|
|
int quo;
|
|
|
|
assert(y > 0);
|
|
quo = x / y;
|
|
*r = x - quo * y;
|
|
if (*r < 0) {
|
|
--quo;
|
|
*r += y;
|
|
}
|
|
assert(0 <= *r && *r < y);
|
|
return quo;
|
|
}
|
|
|
|
/* Round a double to the nearest long. |x| must be small enough to fit
|
|
* in a C long; this is not checked.
|
|
*/
|
|
static long
|
|
round_to_long(double x)
|
|
{
|
|
if (x >= 0.0)
|
|
x = floor(x + 0.5);
|
|
else
|
|
x = ceil(x - 0.5);
|
|
return (long)x;
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* General calendrical helper functions
|
|
*/
|
|
|
|
/* For each month ordinal in 1..12, the number of days in that month,
|
|
* and the number of days before that month in the same year. These
|
|
* are correct for non-leap years only.
|
|
*/
|
|
static int _days_in_month[] = {
|
|
0, /* unused; this vector uses 1-based indexing */
|
|
31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
|
|
};
|
|
|
|
static int _days_before_month[] = {
|
|
0, /* unused; this vector uses 1-based indexing */
|
|
0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
|
|
};
|
|
|
|
/* year -> 1 if leap year, else 0. */
|
|
static int
|
|
is_leap(int year)
|
|
{
|
|
/* Cast year to unsigned. The result is the same either way, but
|
|
* C can generate faster code for unsigned mod than for signed
|
|
* mod (especially for % 4 -- a good compiler should just grab
|
|
* the last 2 bits when the LHS is unsigned).
|
|
*/
|
|
const unsigned int ayear = (unsigned int)year;
|
|
return ayear % 4 == 0 && (ayear % 100 != 0 || ayear % 400 == 0);
|
|
}
|
|
|
|
/* year, month -> number of days in that month in that year */
|
|
static int
|
|
days_in_month(int year, int month)
|
|
{
|
|
assert(month >= 1);
|
|
assert(month <= 12);
|
|
if (month == 2 && is_leap(year))
|
|
return 29;
|
|
else
|
|
return _days_in_month[month];
|
|
}
|
|
|
|
/* year, month -> number of days in year preceeding first day of month */
|
|
static int
|
|
days_before_month(int year, int month)
|
|
{
|
|
int days;
|
|
|
|
assert(month >= 1);
|
|
assert(month <= 12);
|
|
days = _days_before_month[month];
|
|
if (month > 2 && is_leap(year))
|
|
++days;
|
|
return days;
|
|
}
|
|
|
|
/* year -> number of days before January 1st of year. Remember that we
|
|
* start with year 1, so days_before_year(1) == 0.
|
|
*/
|
|
static int
|
|
days_before_year(int year)
|
|
{
|
|
int y = year - 1;
|
|
/* This is incorrect if year <= 0; we really want the floor
|
|
* here. But so long as MINYEAR is 1, the smallest year this
|
|
* can see is 0 (this can happen in some normalization endcases),
|
|
* so we'll just special-case that.
|
|
*/
|
|
assert (year >= 0);
|
|
if (y >= 0)
|
|
return y*365 + y/4 - y/100 + y/400;
|
|
else {
|
|
assert(y == -1);
|
|
return -366;
|
|
}
|
|
}
|
|
|
|
/* Number of days in 4, 100, and 400 year cycles. That these have
|
|
* the correct values is asserted in the module init function.
|
|
*/
|
|
#define DI4Y 1461 /* days_before_year(5); days in 4 years */
|
|
#define DI100Y 36524 /* days_before_year(101); days in 100 years */
|
|
#define DI400Y 146097 /* days_before_year(401); days in 400 years */
|
|
|
|
/* ordinal -> year, month, day, considering 01-Jan-0001 as day 1. */
|
|
static void
|
|
ord_to_ymd(int ordinal, int *year, int *month, int *day)
|
|
{
|
|
int n, n1, n4, n100, n400, leapyear, preceding;
|
|
|
|
/* ordinal is a 1-based index, starting at 1-Jan-1. The pattern of
|
|
* leap years repeats exactly every 400 years. The basic strategy is
|
|
* to find the closest 400-year boundary at or before ordinal, then
|
|
* work with the offset from that boundary to ordinal. Life is much
|
|
* clearer if we subtract 1 from ordinal first -- then the values
|
|
* of ordinal at 400-year boundaries are exactly those divisible
|
|
* by DI400Y:
|
|
*
|
|
* D M Y n n-1
|
|
* -- --- ---- ---------- ----------------
|
|
* 31 Dec -400 -DI400Y -DI400Y -1
|
|
* 1 Jan -399 -DI400Y +1 -DI400Y 400-year boundary
|
|
* ...
|
|
* 30 Dec 000 -1 -2
|
|
* 31 Dec 000 0 -1
|
|
* 1 Jan 001 1 0 400-year boundary
|
|
* 2 Jan 001 2 1
|
|
* 3 Jan 001 3 2
|
|
* ...
|
|
* 31 Dec 400 DI400Y DI400Y -1
|
|
* 1 Jan 401 DI400Y +1 DI400Y 400-year boundary
|
|
*/
|
|
assert(ordinal >= 1);
|
|
--ordinal;
|
|
n400 = ordinal / DI400Y;
|
|
n = ordinal % DI400Y;
|
|
*year = n400 * 400 + 1;
|
|
|
|
/* Now n is the (non-negative) offset, in days, from January 1 of
|
|
* year, to the desired date. Now compute how many 100-year cycles
|
|
* precede n.
|
|
* Note that it's possible for n100 to equal 4! In that case 4 full
|
|
* 100-year cycles precede the desired day, which implies the
|
|
* desired day is December 31 at the end of a 400-year cycle.
|
|
*/
|
|
n100 = n / DI100Y;
|
|
n = n % DI100Y;
|
|
|
|
/* Now compute how many 4-year cycles precede it. */
|
|
n4 = n / DI4Y;
|
|
n = n % DI4Y;
|
|
|
|
/* And now how many single years. Again n1 can be 4, and again
|
|
* meaning that the desired day is December 31 at the end of the
|
|
* 4-year cycle.
|
|
*/
|
|
n1 = n / 365;
|
|
n = n % 365;
|
|
|
|
*year += n100 * 100 + n4 * 4 + n1;
|
|
if (n1 == 4 || n100 == 4) {
|
|
assert(n == 0);
|
|
*year -= 1;
|
|
*month = 12;
|
|
*day = 31;
|
|
return;
|
|
}
|
|
|
|
/* Now the year is correct, and n is the offset from January 1. We
|
|
* find the month via an estimate that's either exact or one too
|
|
* large.
|
|
*/
|
|
leapyear = n1 == 3 && (n4 != 24 || n100 == 3);
|
|
assert(leapyear == is_leap(*year));
|
|
*month = (n + 50) >> 5;
|
|
preceding = (_days_before_month[*month] + (*month > 2 && leapyear));
|
|
if (preceding > n) {
|
|
/* estimate is too large */
|
|
*month -= 1;
|
|
preceding -= days_in_month(*year, *month);
|
|
}
|
|
n -= preceding;
|
|
assert(0 <= n);
|
|
assert(n < days_in_month(*year, *month));
|
|
|
|
*day = n + 1;
|
|
}
|
|
|
|
/* year, month, day -> ordinal, considering 01-Jan-0001 as day 1. */
|
|
static int
|
|
ymd_to_ord(int year, int month, int day)
|
|
{
|
|
return days_before_year(year) + days_before_month(year, month) + day;
|
|
}
|
|
|
|
/* Day of week, where Monday==0, ..., Sunday==6. 1/1/1 was a Monday. */
|
|
static int
|
|
weekday(int year, int month, int day)
|
|
{
|
|
return (ymd_to_ord(year, month, day) + 6) % 7;
|
|
}
|
|
|
|
/* Ordinal of the Monday starting week 1 of the ISO year. Week 1 is the
|
|
* first calendar week containing a Thursday.
|
|
*/
|
|
static int
|
|
iso_week1_monday(int year)
|
|
{
|
|
int first_day = ymd_to_ord(year, 1, 1); /* ord of 1/1 */
|
|
/* 0 if 1/1 is a Monday, 1 if a Tue, etc. */
|
|
int first_weekday = (first_day + 6) % 7;
|
|
/* ordinal of closest Monday at or before 1/1 */
|
|
int week1_monday = first_day - first_weekday;
|
|
|
|
if (first_weekday > 3) /* if 1/1 was Fri, Sat, Sun */
|
|
week1_monday += 7;
|
|
return week1_monday;
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Range checkers.
|
|
*/
|
|
|
|
/* Check that -MAX_DELTA_DAYS <= days <= MAX_DELTA_DAYS. If so, return 0.
|
|
* If not, raise OverflowError and return -1.
|
|
*/
|
|
static int
|
|
check_delta_day_range(int days)
|
|
{
|
|
if (-MAX_DELTA_DAYS <= days && days <= MAX_DELTA_DAYS)
|
|
return 0;
|
|
PyErr_Format(PyExc_OverflowError,
|
|
"days=%d; must have magnitude <= %d",
|
|
days, MAX_DELTA_DAYS);
|
|
return -1;
|
|
}
|
|
|
|
/* Check that date arguments are in range. Return 0 if they are. If they
|
|
* aren't, raise ValueError and return -1.
|
|
*/
|
|
static int
|
|
check_date_args(int year, int month, int day)
|
|
{
|
|
|
|
if (year < MINYEAR || year > MAXYEAR) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"year is out of range");
|
|
return -1;
|
|
}
|
|
if (month < 1 || month > 12) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"month must be in 1..12");
|
|
return -1;
|
|
}
|
|
if (day < 1 || day > days_in_month(year, month)) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"day is out of range for month");
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Check that time arguments are in range. Return 0 if they are. If they
|
|
* aren't, raise ValueError and return -1.
|
|
*/
|
|
static int
|
|
check_time_args(int h, int m, int s, int us)
|
|
{
|
|
if (h < 0 || h > 23) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"hour must be in 0..23");
|
|
return -1;
|
|
}
|
|
if (m < 0 || m > 59) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"minute must be in 0..59");
|
|
return -1;
|
|
}
|
|
if (s < 0 || s > 59) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"second must be in 0..59");
|
|
return -1;
|
|
}
|
|
if (us < 0 || us > 999999) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"microsecond must be in 0..999999");
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Normalization utilities.
|
|
*/
|
|
|
|
/* One step of a mixed-radix conversion. A "hi" unit is equivalent to
|
|
* factor "lo" units. factor must be > 0. If *lo is less than 0, or
|
|
* at least factor, enough of *lo is converted into "hi" units so that
|
|
* 0 <= *lo < factor. The input values must be such that int overflow
|
|
* is impossible.
|
|
*/
|
|
static void
|
|
normalize_pair(int *hi, int *lo, int factor)
|
|
{
|
|
assert(factor > 0);
|
|
assert(lo != hi);
|
|
if (*lo < 0 || *lo >= factor) {
|
|
const int num_hi = divmod(*lo, factor, lo);
|
|
const int new_hi = *hi + num_hi;
|
|
assert(! SIGNED_ADD_OVERFLOWED(new_hi, *hi, num_hi));
|
|
*hi = new_hi;
|
|
}
|
|
assert(0 <= *lo && *lo < factor);
|
|
}
|
|
|
|
/* Fiddle days (d), seconds (s), and microseconds (us) so that
|
|
* 0 <= *s < 24*3600
|
|
* 0 <= *us < 1000000
|
|
* The input values must be such that the internals don't overflow.
|
|
* The way this routine is used, we don't get close.
|
|
*/
|
|
static void
|
|
normalize_d_s_us(int *d, int *s, int *us)
|
|
{
|
|
if (*us < 0 || *us >= 1000000) {
|
|
normalize_pair(s, us, 1000000);
|
|
/* |s| can't be bigger than about
|
|
* |original s| + |original us|/1000000 now.
|
|
*/
|
|
|
|
}
|
|
if (*s < 0 || *s >= 24*3600) {
|
|
normalize_pair(d, s, 24*3600);
|
|
/* |d| can't be bigger than about
|
|
* |original d| +
|
|
* (|original s| + |original us|/1000000) / (24*3600) now.
|
|
*/
|
|
}
|
|
assert(0 <= *s && *s < 24*3600);
|
|
assert(0 <= *us && *us < 1000000);
|
|
}
|
|
|
|
/* Fiddle years (y), months (m), and days (d) so that
|
|
* 1 <= *m <= 12
|
|
* 1 <= *d <= days_in_month(*y, *m)
|
|
* The input values must be such that the internals don't overflow.
|
|
* The way this routine is used, we don't get close.
|
|
*/
|
|
static void
|
|
normalize_y_m_d(int *y, int *m, int *d)
|
|
{
|
|
int dim; /* # of days in month */
|
|
|
|
/* This gets muddy: the proper range for day can't be determined
|
|
* without knowing the correct month and year, but if day is, e.g.,
|
|
* plus or minus a million, the current month and year values make
|
|
* no sense (and may also be out of bounds themselves).
|
|
* Saying 12 months == 1 year should be non-controversial.
|
|
*/
|
|
if (*m < 1 || *m > 12) {
|
|
--*m;
|
|
normalize_pair(y, m, 12);
|
|
++*m;
|
|
/* |y| can't be bigger than about
|
|
* |original y| + |original m|/12 now.
|
|
*/
|
|
}
|
|
assert(1 <= *m && *m <= 12);
|
|
|
|
/* Now only day can be out of bounds (year may also be out of bounds
|
|
* for a datetime object, but we don't care about that here).
|
|
* If day is out of bounds, what to do is arguable, but at least the
|
|
* method here is principled and explainable.
|
|
*/
|
|
dim = days_in_month(*y, *m);
|
|
if (*d < 1 || *d > dim) {
|
|
/* Move day-1 days from the first of the month. First try to
|
|
* get off cheap if we're only one day out of range
|
|
* (adjustments for timezone alone can't be worse than that).
|
|
*/
|
|
if (*d == 0) {
|
|
--*m;
|
|
if (*m > 0)
|
|
*d = days_in_month(*y, *m);
|
|
else {
|
|
--*y;
|
|
*m = 12;
|
|
*d = 31;
|
|
}
|
|
}
|
|
else if (*d == dim + 1) {
|
|
/* move forward a day */
|
|
++*m;
|
|
*d = 1;
|
|
if (*m > 12) {
|
|
*m = 1;
|
|
++*y;
|
|
}
|
|
}
|
|
else {
|
|
int ordinal = ymd_to_ord(*y, *m, 1) +
|
|
*d - 1;
|
|
ord_to_ymd(ordinal, y, m, d);
|
|
}
|
|
}
|
|
assert(*m > 0);
|
|
assert(*d > 0);
|
|
}
|
|
|
|
/* Fiddle out-of-bounds months and days so that the result makes some kind
|
|
* of sense. The parameters are both inputs and outputs. Returns < 0 on
|
|
* failure, where failure means the adjusted year is out of bounds.
|
|
*/
|
|
static int
|
|
normalize_date(int *year, int *month, int *day)
|
|
{
|
|
int result;
|
|
|
|
normalize_y_m_d(year, month, day);
|
|
if (MINYEAR <= *year && *year <= MAXYEAR)
|
|
result = 0;
|
|
else {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"date value out of range");
|
|
result = -1;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/* Force all the datetime fields into range. The parameters are both
|
|
* inputs and outputs. Returns < 0 on error.
|
|
*/
|
|
static int
|
|
normalize_datetime(int *year, int *month, int *day,
|
|
int *hour, int *minute, int *second,
|
|
int *microsecond)
|
|
{
|
|
normalize_pair(second, microsecond, 1000000);
|
|
normalize_pair(minute, second, 60);
|
|
normalize_pair(hour, minute, 60);
|
|
normalize_pair(day, hour, 24);
|
|
return normalize_date(year, month, day);
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Basic object allocation: tp_alloc implementations. These allocate
|
|
* Python objects of the right size and type, and do the Python object-
|
|
* initialization bit. If there's not enough memory, they return NULL after
|
|
* setting MemoryError. All data members remain uninitialized trash.
|
|
*
|
|
* We abuse the tp_alloc "nitems" argument to communicate whether a tzinfo
|
|
* member is needed. This is ugly, imprecise, and possibly insecure.
|
|
* tp_basicsize for the time and datetime types is set to the size of the
|
|
* struct that has room for the tzinfo member, so subclasses in Python will
|
|
* allocate enough space for a tzinfo member whether or not one is actually
|
|
* needed. That's the "ugly and imprecise" parts. The "possibly insecure"
|
|
* part is that PyType_GenericAlloc() (which subclasses in Python end up
|
|
* using) just happens today to effectively ignore the nitems argument
|
|
* when tp_itemsize is 0, which it is for these type objects. If that
|
|
* changes, perhaps the callers of tp_alloc slots in this file should
|
|
* be changed to force a 0 nitems argument unless the type being allocated
|
|
* is a base type implemented in this file (so that tp_alloc is time_alloc
|
|
* or datetime_alloc below, which know about the nitems abuse).
|
|
*/
|
|
|
|
static PyObject *
|
|
time_alloc(PyTypeObject *type, Py_ssize_t aware)
|
|
{
|
|
PyObject *self;
|
|
|
|
self = (PyObject *)
|
|
PyObject_MALLOC(aware ?
|
|
sizeof(PyDateTime_Time) :
|
|
sizeof(_PyDateTime_BaseTime));
|
|
if (self == NULL)
|
|
return (PyObject *)PyErr_NoMemory();
|
|
PyObject_INIT(self, type);
|
|
return self;
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_alloc(PyTypeObject *type, Py_ssize_t aware)
|
|
{
|
|
PyObject *self;
|
|
|
|
self = (PyObject *)
|
|
PyObject_MALLOC(aware ?
|
|
sizeof(PyDateTime_DateTime) :
|
|
sizeof(_PyDateTime_BaseDateTime));
|
|
if (self == NULL)
|
|
return (PyObject *)PyErr_NoMemory();
|
|
PyObject_INIT(self, type);
|
|
return self;
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Helpers for setting object fields. These work on pointers to the
|
|
* appropriate base class.
|
|
*/
|
|
|
|
/* For date and datetime. */
|
|
static void
|
|
set_date_fields(PyDateTime_Date *self, int y, int m, int d)
|
|
{
|
|
self->hashcode = -1;
|
|
SET_YEAR(self, y);
|
|
SET_MONTH(self, m);
|
|
SET_DAY(self, d);
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Create various objects, mostly without range checking.
|
|
*/
|
|
|
|
/* Create a date instance with no range checking. */
|
|
static PyObject *
|
|
new_date_ex(int year, int month, int day, PyTypeObject *type)
|
|
{
|
|
PyDateTime_Date *self;
|
|
|
|
self = (PyDateTime_Date *) (type->tp_alloc(type, 0));
|
|
if (self != NULL)
|
|
set_date_fields(self, year, month, day);
|
|
return (PyObject *) self;
|
|
}
|
|
|
|
#define new_date(year, month, day) \
|
|
new_date_ex(year, month, day, &PyDateTime_DateType)
|
|
|
|
/* Create a datetime instance with no range checking. */
|
|
static PyObject *
|
|
new_datetime_ex(int year, int month, int day, int hour, int minute,
|
|
int second, int usecond, PyObject *tzinfo, PyTypeObject *type)
|
|
{
|
|
PyDateTime_DateTime *self;
|
|
char aware = tzinfo != Py_None;
|
|
|
|
self = (PyDateTime_DateTime *) (type->tp_alloc(type, aware));
|
|
if (self != NULL) {
|
|
self->hastzinfo = aware;
|
|
set_date_fields((PyDateTime_Date *)self, year, month, day);
|
|
DATE_SET_HOUR(self, hour);
|
|
DATE_SET_MINUTE(self, minute);
|
|
DATE_SET_SECOND(self, second);
|
|
DATE_SET_MICROSECOND(self, usecond);
|
|
if (aware) {
|
|
Py_INCREF(tzinfo);
|
|
self->tzinfo = tzinfo;
|
|
}
|
|
}
|
|
return (PyObject *)self;
|
|
}
|
|
|
|
#define new_datetime(y, m, d, hh, mm, ss, us, tzinfo) \
|
|
new_datetime_ex(y, m, d, hh, mm, ss, us, tzinfo, \
|
|
&PyDateTime_DateTimeType)
|
|
|
|
/* Create a time instance with no range checking. */
|
|
static PyObject *
|
|
new_time_ex(int hour, int minute, int second, int usecond,
|
|
PyObject *tzinfo, PyTypeObject *type)
|
|
{
|
|
PyDateTime_Time *self;
|
|
char aware = tzinfo != Py_None;
|
|
|
|
self = (PyDateTime_Time *) (type->tp_alloc(type, aware));
|
|
if (self != NULL) {
|
|
self->hastzinfo = aware;
|
|
self->hashcode = -1;
|
|
TIME_SET_HOUR(self, hour);
|
|
TIME_SET_MINUTE(self, minute);
|
|
TIME_SET_SECOND(self, second);
|
|
TIME_SET_MICROSECOND(self, usecond);
|
|
if (aware) {
|
|
Py_INCREF(tzinfo);
|
|
self->tzinfo = tzinfo;
|
|
}
|
|
}
|
|
return (PyObject *)self;
|
|
}
|
|
|
|
#define new_time(hh, mm, ss, us, tzinfo) \
|
|
new_time_ex(hh, mm, ss, us, tzinfo, &PyDateTime_TimeType)
|
|
|
|
/* Create a timedelta instance. Normalize the members iff normalize is
|
|
* true. Passing false is a speed optimization, if you know for sure
|
|
* that seconds and microseconds are already in their proper ranges. In any
|
|
* case, raises OverflowError and returns NULL if the normalized days is out
|
|
* of range).
|
|
*/
|
|
static PyObject *
|
|
new_delta_ex(int days, int seconds, int microseconds, int normalize,
|
|
PyTypeObject *type)
|
|
{
|
|
PyDateTime_Delta *self;
|
|
|
|
if (normalize)
|
|
normalize_d_s_us(&days, &seconds, µseconds);
|
|
assert(0 <= seconds && seconds < 24*3600);
|
|
assert(0 <= microseconds && microseconds < 1000000);
|
|
|
|
if (check_delta_day_range(days) < 0)
|
|
return NULL;
|
|
|
|
self = (PyDateTime_Delta *) (type->tp_alloc(type, 0));
|
|
if (self != NULL) {
|
|
self->hashcode = -1;
|
|
SET_TD_DAYS(self, days);
|
|
SET_TD_SECONDS(self, seconds);
|
|
SET_TD_MICROSECONDS(self, microseconds);
|
|
}
|
|
return (PyObject *) self;
|
|
}
|
|
|
|
#define new_delta(d, s, us, normalize) \
|
|
new_delta_ex(d, s, us, normalize, &PyDateTime_DeltaType)
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* tzinfo helpers.
|
|
*/
|
|
|
|
/* Ensure that p is None or of a tzinfo subclass. Return 0 if OK; if not
|
|
* raise TypeError and return -1.
|
|
*/
|
|
static int
|
|
check_tzinfo_subclass(PyObject *p)
|
|
{
|
|
if (p == Py_None || PyTZInfo_Check(p))
|
|
return 0;
|
|
PyErr_Format(PyExc_TypeError,
|
|
"tzinfo argument must be None or of a tzinfo subclass, "
|
|
"not type '%s'",
|
|
p->ob_type->tp_name);
|
|
return -1;
|
|
}
|
|
|
|
/* Return tzinfo.methname(tzinfoarg), without any checking of results.
|
|
* If tzinfo is None, returns None.
|
|
*/
|
|
static PyObject *
|
|
call_tzinfo_method(PyObject *tzinfo, char *methname, PyObject *tzinfoarg)
|
|
{
|
|
PyObject *result;
|
|
|
|
assert(tzinfo && methname && tzinfoarg);
|
|
assert(check_tzinfo_subclass(tzinfo) >= 0);
|
|
if (tzinfo == Py_None) {
|
|
result = Py_None;
|
|
Py_INCREF(result);
|
|
}
|
|
else
|
|
result = PyObject_CallMethod(tzinfo, methname, "O", tzinfoarg);
|
|
return result;
|
|
}
|
|
|
|
/* If self has a tzinfo member, return a BORROWED reference to it. Else
|
|
* return NULL, which is NOT AN ERROR. There are no error returns here,
|
|
* and the caller must not decref the result.
|
|
*/
|
|
static PyObject *
|
|
get_tzinfo_member(PyObject *self)
|
|
{
|
|
PyObject *tzinfo = NULL;
|
|
|
|
if (PyDateTime_Check(self) && HASTZINFO(self))
|
|
tzinfo = ((PyDateTime_DateTime *)self)->tzinfo;
|
|
else if (PyTime_Check(self) && HASTZINFO(self))
|
|
tzinfo = ((PyDateTime_Time *)self)->tzinfo;
|
|
|
|
return tzinfo;
|
|
}
|
|
|
|
/* Call getattr(tzinfo, name)(tzinfoarg), and extract an int from the
|
|
* result. tzinfo must be an instance of the tzinfo class. If the method
|
|
* returns None, this returns 0 and sets *none to 1. If the method doesn't
|
|
* return None or timedelta, TypeError is raised and this returns -1. If it
|
|
* returnsa timedelta and the value is out of range or isn't a whole number
|
|
* of minutes, ValueError is raised and this returns -1.
|
|
* Else *none is set to 0 and the integer method result is returned.
|
|
*/
|
|
static int
|
|
call_utc_tzinfo_method(PyObject *tzinfo, char *name, PyObject *tzinfoarg,
|
|
int *none)
|
|
{
|
|
PyObject *u;
|
|
int result = -1;
|
|
|
|
assert(tzinfo != NULL);
|
|
assert(PyTZInfo_Check(tzinfo));
|
|
assert(tzinfoarg != NULL);
|
|
|
|
*none = 0;
|
|
u = call_tzinfo_method(tzinfo, name, tzinfoarg);
|
|
if (u == NULL)
|
|
return -1;
|
|
|
|
else if (u == Py_None) {
|
|
result = 0;
|
|
*none = 1;
|
|
}
|
|
else if (PyDelta_Check(u)) {
|
|
const int days = GET_TD_DAYS(u);
|
|
if (days < -1 || days > 0)
|
|
result = 24*60; /* trigger ValueError below */
|
|
else {
|
|
/* next line can't overflow because we know days
|
|
* is -1 or 0 now
|
|
*/
|
|
int ss = days * 24 * 3600 + GET_TD_SECONDS(u);
|
|
result = divmod(ss, 60, &ss);
|
|
if (ss || GET_TD_MICROSECONDS(u)) {
|
|
PyErr_Format(PyExc_ValueError,
|
|
"tzinfo.%s() must return a "
|
|
"whole number of minutes",
|
|
name);
|
|
result = -1;
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"tzinfo.%s() must return None or "
|
|
"timedelta, not '%s'",
|
|
name, u->ob_type->tp_name);
|
|
}
|
|
|
|
Py_DECREF(u);
|
|
if (result < -1439 || result > 1439) {
|
|
PyErr_Format(PyExc_ValueError,
|
|
"tzinfo.%s() returned %d; must be in "
|
|
"-1439 .. 1439",
|
|
name, result);
|
|
result = -1;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/* Call tzinfo.utcoffset(tzinfoarg), and extract an integer from the
|
|
* result. tzinfo must be an instance of the tzinfo class. If utcoffset()
|
|
* returns None, call_utcoffset returns 0 and sets *none to 1. If uctoffset()
|
|
* doesn't return None or timedelta, TypeError is raised and this returns -1.
|
|
* If utcoffset() returns an invalid timedelta (out of range, or not a whole
|
|
* # of minutes), ValueError is raised and this returns -1. Else *none is
|
|
* set to 0 and the offset is returned (as int # of minutes east of UTC).
|
|
*/
|
|
static int
|
|
call_utcoffset(PyObject *tzinfo, PyObject *tzinfoarg, int *none)
|
|
{
|
|
return call_utc_tzinfo_method(tzinfo, "utcoffset", tzinfoarg, none);
|
|
}
|
|
|
|
/* Call tzinfo.name(tzinfoarg), and return the offset as a timedelta or None.
|
|
*/
|
|
static PyObject *
|
|
offset_as_timedelta(PyObject *tzinfo, char *name, PyObject *tzinfoarg) {
|
|
PyObject *result;
|
|
|
|
assert(tzinfo && name && tzinfoarg);
|
|
if (tzinfo == Py_None) {
|
|
result = Py_None;
|
|
Py_INCREF(result);
|
|
}
|
|
else {
|
|
int none;
|
|
int offset = call_utc_tzinfo_method(tzinfo, name, tzinfoarg,
|
|
&none);
|
|
if (offset < 0 && PyErr_Occurred())
|
|
return NULL;
|
|
if (none) {
|
|
result = Py_None;
|
|
Py_INCREF(result);
|
|
}
|
|
else
|
|
result = new_delta(0, offset * 60, 0, 1);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/* Call tzinfo.dst(tzinfoarg), and extract an integer from the
|
|
* result. tzinfo must be an instance of the tzinfo class. If dst()
|
|
* returns None, call_dst returns 0 and sets *none to 1. If dst()
|
|
& doesn't return None or timedelta, TypeError is raised and this
|
|
* returns -1. If dst() returns an invalid timedelta for a UTC offset,
|
|
* ValueError is raised and this returns -1. Else *none is set to 0 and
|
|
* the offset is returned (as an int # of minutes east of UTC).
|
|
*/
|
|
static int
|
|
call_dst(PyObject *tzinfo, PyObject *tzinfoarg, int *none)
|
|
{
|
|
return call_utc_tzinfo_method(tzinfo, "dst", tzinfoarg, none);
|
|
}
|
|
|
|
/* Call tzinfo.tzname(tzinfoarg), and return the result. tzinfo must be
|
|
* an instance of the tzinfo class or None. If tzinfo isn't None, and
|
|
* tzname() doesn't return None or a string, TypeError is raised and this
|
|
* returns NULL.
|
|
*/
|
|
static PyObject *
|
|
call_tzname(PyObject *tzinfo, PyObject *tzinfoarg)
|
|
{
|
|
PyObject *result;
|
|
|
|
assert(tzinfo != NULL);
|
|
assert(check_tzinfo_subclass(tzinfo) >= 0);
|
|
assert(tzinfoarg != NULL);
|
|
|
|
if (tzinfo == Py_None) {
|
|
result = Py_None;
|
|
Py_INCREF(result);
|
|
}
|
|
else
|
|
result = PyObject_CallMethod(tzinfo, "tzname", "O", tzinfoarg);
|
|
|
|
if (result != NULL && result != Py_None && ! PyString_Check(result)) {
|
|
PyErr_Format(PyExc_TypeError, "tzinfo.tzname() must "
|
|
"return None or a string, not '%s'",
|
|
result->ob_type->tp_name);
|
|
Py_DECREF(result);
|
|
result = NULL;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
typedef enum {
|
|
/* an exception has been set; the caller should pass it on */
|
|
OFFSET_ERROR,
|
|
|
|
/* type isn't date, datetime, or time subclass */
|
|
OFFSET_UNKNOWN,
|
|
|
|
/* date,
|
|
* datetime with !hastzinfo
|
|
* datetime with None tzinfo,
|
|
* datetime where utcoffset() returns None
|
|
* time with !hastzinfo
|
|
* time with None tzinfo,
|
|
* time where utcoffset() returns None
|
|
*/
|
|
OFFSET_NAIVE,
|
|
|
|
/* time or datetime where utcoffset() doesn't return None */
|
|
OFFSET_AWARE
|
|
} naivety;
|
|
|
|
/* Classify an object as to whether it's naive or offset-aware. See
|
|
* the "naivety" typedef for details. If the type is aware, *offset is set
|
|
* to minutes east of UTC (as returned by the tzinfo.utcoffset() method).
|
|
* If the type is offset-naive (or unknown, or error), *offset is set to 0.
|
|
* tzinfoarg is the argument to pass to the tzinfo.utcoffset() method.
|
|
*/
|
|
static naivety
|
|
classify_utcoffset(PyObject *op, PyObject *tzinfoarg, int *offset)
|
|
{
|
|
int none;
|
|
PyObject *tzinfo;
|
|
|
|
assert(tzinfoarg != NULL);
|
|
*offset = 0;
|
|
tzinfo = get_tzinfo_member(op); /* NULL means no tzinfo, not error */
|
|
if (tzinfo == Py_None)
|
|
return OFFSET_NAIVE;
|
|
if (tzinfo == NULL) {
|
|
/* note that a datetime passes the PyDate_Check test */
|
|
return (PyTime_Check(op) || PyDate_Check(op)) ?
|
|
OFFSET_NAIVE : OFFSET_UNKNOWN;
|
|
}
|
|
*offset = call_utcoffset(tzinfo, tzinfoarg, &none);
|
|
if (*offset == -1 && PyErr_Occurred())
|
|
return OFFSET_ERROR;
|
|
return none ? OFFSET_NAIVE : OFFSET_AWARE;
|
|
}
|
|
|
|
/* Classify two objects as to whether they're naive or offset-aware.
|
|
* This isn't quite the same as calling classify_utcoffset() twice: for
|
|
* binary operations (comparison and subtraction), we generally want to
|
|
* ignore the tzinfo members if they're identical. This is by design,
|
|
* so that results match "naive" expectations when mixing objects from a
|
|
* single timezone. So in that case, this sets both offsets to 0 and
|
|
* both naiveties to OFFSET_NAIVE.
|
|
* The function returns 0 if everything's OK, and -1 on error.
|
|
*/
|
|
static int
|
|
classify_two_utcoffsets(PyObject *o1, int *offset1, naivety *n1,
|
|
PyObject *tzinfoarg1,
|
|
PyObject *o2, int *offset2, naivety *n2,
|
|
PyObject *tzinfoarg2)
|
|
{
|
|
if (get_tzinfo_member(o1) == get_tzinfo_member(o2)) {
|
|
*offset1 = *offset2 = 0;
|
|
*n1 = *n2 = OFFSET_NAIVE;
|
|
}
|
|
else {
|
|
*n1 = classify_utcoffset(o1, tzinfoarg1, offset1);
|
|
if (*n1 == OFFSET_ERROR)
|
|
return -1;
|
|
*n2 = classify_utcoffset(o2, tzinfoarg2, offset2);
|
|
if (*n2 == OFFSET_ERROR)
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* repr is like "someclass(arg1, arg2)". If tzinfo isn't None,
|
|
* stuff
|
|
* ", tzinfo=" + repr(tzinfo)
|
|
* before the closing ")".
|
|
*/
|
|
static PyObject *
|
|
append_keyword_tzinfo(PyObject *repr, PyObject *tzinfo)
|
|
{
|
|
PyObject *temp;
|
|
|
|
assert(PyString_Check(repr));
|
|
assert(tzinfo);
|
|
if (tzinfo == Py_None)
|
|
return repr;
|
|
/* Get rid of the trailing ')'. */
|
|
assert(PyString_AsString(repr)[PyString_Size(repr)-1] == ')');
|
|
temp = PyString_FromStringAndSize(PyString_AsString(repr),
|
|
PyString_Size(repr) - 1);
|
|
Py_DECREF(repr);
|
|
if (temp == NULL)
|
|
return NULL;
|
|
repr = temp;
|
|
|
|
/* Append ", tzinfo=". */
|
|
PyString_ConcatAndDel(&repr, PyString_FromString(", tzinfo="));
|
|
|
|
/* Append repr(tzinfo). */
|
|
PyString_ConcatAndDel(&repr, PyObject_Repr(tzinfo));
|
|
|
|
/* Add a closing paren. */
|
|
PyString_ConcatAndDel(&repr, PyString_FromString(")"));
|
|
return repr;
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* String format helpers.
|
|
*/
|
|
|
|
static PyObject *
|
|
format_ctime(PyDateTime_Date *date, int hours, int minutes, int seconds)
|
|
{
|
|
static const char *DayNames[] = {
|
|
"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
|
|
};
|
|
static const char *MonthNames[] = {
|
|
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
|
|
};
|
|
|
|
char buffer[128];
|
|
int wday = weekday(GET_YEAR(date), GET_MONTH(date), GET_DAY(date));
|
|
|
|
PyOS_snprintf(buffer, sizeof(buffer), "%s %s %2d %02d:%02d:%02d %04d",
|
|
DayNames[wday], MonthNames[GET_MONTH(date) - 1],
|
|
GET_DAY(date), hours, minutes, seconds,
|
|
GET_YEAR(date));
|
|
return PyString_FromString(buffer);
|
|
}
|
|
|
|
/* Add an hours & minutes UTC offset string to buf. buf has no more than
|
|
* buflen bytes remaining. The UTC offset is gotten by calling
|
|
* tzinfo.uctoffset(tzinfoarg). If that returns None, \0 is stored into
|
|
* *buf, and that's all. Else the returned value is checked for sanity (an
|
|
* integer in range), and if that's OK it's converted to an hours & minutes
|
|
* string of the form
|
|
* sign HH sep MM
|
|
* Returns 0 if everything is OK. If the return value from utcoffset() is
|
|
* bogus, an appropriate exception is set and -1 is returned.
|
|
*/
|
|
static int
|
|
format_utcoffset(char *buf, size_t buflen, const char *sep,
|
|
PyObject *tzinfo, PyObject *tzinfoarg)
|
|
{
|
|
int offset;
|
|
int hours;
|
|
int minutes;
|
|
char sign;
|
|
int none;
|
|
|
|
offset = call_utcoffset(tzinfo, tzinfoarg, &none);
|
|
if (offset == -1 && PyErr_Occurred())
|
|
return -1;
|
|
if (none) {
|
|
*buf = '\0';
|
|
return 0;
|
|
}
|
|
sign = '+';
|
|
if (offset < 0) {
|
|
sign = '-';
|
|
offset = - offset;
|
|
}
|
|
hours = divmod(offset, 60, &minutes);
|
|
PyOS_snprintf(buf, buflen, "%c%02d%s%02d", sign, hours, sep, minutes);
|
|
return 0;
|
|
}
|
|
|
|
/* I sure don't want to reproduce the strftime code from the time module,
|
|
* so this imports the module and calls it. All the hair is due to
|
|
* giving special meanings to the %z and %Z format codes via a preprocessing
|
|
* step on the format string.
|
|
* tzinfoarg is the argument to pass to the object's tzinfo method, if
|
|
* needed.
|
|
*/
|
|
static PyObject *
|
|
wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
|
|
PyObject *tzinfoarg)
|
|
{
|
|
PyObject *result = NULL; /* guilty until proved innocent */
|
|
|
|
PyObject *zreplacement = NULL; /* py string, replacement for %z */
|
|
PyObject *Zreplacement = NULL; /* py string, replacement for %Z */
|
|
|
|
char *pin; /* pointer to next char in input format */
|
|
char ch; /* next char in input format */
|
|
|
|
PyObject *newfmt = NULL; /* py string, the output format */
|
|
char *pnew; /* pointer to available byte in output format */
|
|
int totalnew; /* number bytes total in output format buffer,
|
|
exclusive of trailing \0 */
|
|
int usednew; /* number bytes used so far in output format buffer */
|
|
|
|
char *ptoappend; /* pointer to string to append to output buffer */
|
|
int ntoappend; /* # of bytes to append to output buffer */
|
|
|
|
assert(object && format && timetuple);
|
|
assert(PyString_Check(format));
|
|
|
|
/* Give up if the year is before 1900.
|
|
* Python strftime() plays games with the year, and different
|
|
* games depending on whether envar PYTHON2K is set. This makes
|
|
* years before 1900 a nightmare, even if the platform strftime
|
|
* supports them (and not all do).
|
|
* We could get a lot farther here by avoiding Python's strftime
|
|
* wrapper and calling the C strftime() directly, but that isn't
|
|
* an option in the Python implementation of this module.
|
|
*/
|
|
{
|
|
long year;
|
|
PyObject *pyyear = PySequence_GetItem(timetuple, 0);
|
|
if (pyyear == NULL) return NULL;
|
|
assert(PyInt_Check(pyyear));
|
|
year = PyInt_AsLong(pyyear);
|
|
Py_DECREF(pyyear);
|
|
if (year < 1900) {
|
|
PyErr_Format(PyExc_ValueError, "year=%ld is before "
|
|
"1900; the datetime strftime() "
|
|
"methods require year >= 1900",
|
|
year);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* Scan the input format, looking for %z and %Z escapes, building
|
|
* a new format. Since computing the replacements for those codes
|
|
* is expensive, don't unless they're actually used.
|
|
*/
|
|
totalnew = PyString_Size(format) + 1; /* realistic if no %z/%Z */
|
|
newfmt = PyString_FromStringAndSize(NULL, totalnew);
|
|
if (newfmt == NULL) goto Done;
|
|
pnew = PyString_AsString(newfmt);
|
|
usednew = 0;
|
|
|
|
pin = PyString_AsString(format);
|
|
while ((ch = *pin++) != '\0') {
|
|
if (ch != '%') {
|
|
ptoappend = pin - 1;
|
|
ntoappend = 1;
|
|
}
|
|
else if ((ch = *pin++) == '\0') {
|
|
/* There's a lone trailing %; doesn't make sense. */
|
|
PyErr_SetString(PyExc_ValueError, "strftime format "
|
|
"ends with raw %");
|
|
goto Done;
|
|
}
|
|
/* A % has been seen and ch is the character after it. */
|
|
else if (ch == 'z') {
|
|
if (zreplacement == NULL) {
|
|
/* format utcoffset */
|
|
char buf[100];
|
|
PyObject *tzinfo = get_tzinfo_member(object);
|
|
zreplacement = PyString_FromString("");
|
|
if (zreplacement == NULL) goto Done;
|
|
if (tzinfo != Py_None && tzinfo != NULL) {
|
|
assert(tzinfoarg != NULL);
|
|
if (format_utcoffset(buf,
|
|
sizeof(buf),
|
|
"",
|
|
tzinfo,
|
|
tzinfoarg) < 0)
|
|
goto Done;
|
|
Py_DECREF(zreplacement);
|
|
zreplacement = PyString_FromString(buf);
|
|
if (zreplacement == NULL) goto Done;
|
|
}
|
|
}
|
|
assert(zreplacement != NULL);
|
|
ptoappend = PyString_AS_STRING(zreplacement);
|
|
ntoappend = PyString_GET_SIZE(zreplacement);
|
|
}
|
|
else if (ch == 'Z') {
|
|
/* format tzname */
|
|
if (Zreplacement == NULL) {
|
|
PyObject *tzinfo = get_tzinfo_member(object);
|
|
Zreplacement = PyString_FromString("");
|
|
if (Zreplacement == NULL) goto Done;
|
|
if (tzinfo != Py_None && tzinfo != NULL) {
|
|
PyObject *temp;
|
|
assert(tzinfoarg != NULL);
|
|
temp = call_tzname(tzinfo, tzinfoarg);
|
|
if (temp == NULL) goto Done;
|
|
if (temp != Py_None) {
|
|
assert(PyString_Check(temp));
|
|
/* Since the tzname is getting
|
|
* stuffed into the format, we
|
|
* have to double any % signs
|
|
* so that strftime doesn't
|
|
* treat them as format codes.
|
|
*/
|
|
Py_DECREF(Zreplacement);
|
|
Zreplacement = PyObject_CallMethod(
|
|
temp, "replace",
|
|
"ss", "%", "%%");
|
|
Py_DECREF(temp);
|
|
if (Zreplacement == NULL)
|
|
goto Done;
|
|
if (!PyString_Check(Zreplacement)) {
|
|
PyErr_SetString(PyExc_TypeError, "tzname.replace() did not return a string");
|
|
goto Done;
|
|
}
|
|
}
|
|
else
|
|
Py_DECREF(temp);
|
|
}
|
|
}
|
|
assert(Zreplacement != NULL);
|
|
ptoappend = PyString_AS_STRING(Zreplacement);
|
|
ntoappend = PyString_GET_SIZE(Zreplacement);
|
|
}
|
|
else {
|
|
/* percent followed by neither z nor Z */
|
|
ptoappend = pin - 2;
|
|
ntoappend = 2;
|
|
}
|
|
|
|
/* Append the ntoappend chars starting at ptoappend to
|
|
* the new format.
|
|
*/
|
|
assert(ptoappend != NULL);
|
|
assert(ntoappend >= 0);
|
|
if (ntoappend == 0)
|
|
continue;
|
|
while (usednew + ntoappend > totalnew) {
|
|
int bigger = totalnew << 1;
|
|
if ((bigger >> 1) != totalnew) { /* overflow */
|
|
PyErr_NoMemory();
|
|
goto Done;
|
|
}
|
|
if (_PyString_Resize(&newfmt, bigger) < 0)
|
|
goto Done;
|
|
totalnew = bigger;
|
|
pnew = PyString_AsString(newfmt) + usednew;
|
|
}
|
|
memcpy(pnew, ptoappend, ntoappend);
|
|
pnew += ntoappend;
|
|
usednew += ntoappend;
|
|
assert(usednew <= totalnew);
|
|
} /* end while() */
|
|
|
|
if (_PyString_Resize(&newfmt, usednew) < 0)
|
|
goto Done;
|
|
{
|
|
PyObject *time = PyImport_ImportModule("time");
|
|
if (time == NULL)
|
|
goto Done;
|
|
result = PyObject_CallMethod(time, "strftime", "OO",
|
|
newfmt, timetuple);
|
|
Py_DECREF(time);
|
|
}
|
|
Done:
|
|
Py_XDECREF(zreplacement);
|
|
Py_XDECREF(Zreplacement);
|
|
Py_XDECREF(newfmt);
|
|
return result;
|
|
}
|
|
|
|
static char *
|
|
isoformat_date(PyDateTime_Date *dt, char buffer[], int bufflen)
|
|
{
|
|
int x;
|
|
x = PyOS_snprintf(buffer, bufflen,
|
|
"%04d-%02d-%02d",
|
|
GET_YEAR(dt), GET_MONTH(dt), GET_DAY(dt));
|
|
return buffer + x;
|
|
}
|
|
|
|
static void
|
|
isoformat_time(PyDateTime_DateTime *dt, char buffer[], int bufflen)
|
|
{
|
|
int us = DATE_GET_MICROSECOND(dt);
|
|
|
|
PyOS_snprintf(buffer, bufflen,
|
|
"%02d:%02d:%02d", /* 8 characters */
|
|
DATE_GET_HOUR(dt),
|
|
DATE_GET_MINUTE(dt),
|
|
DATE_GET_SECOND(dt));
|
|
if (us)
|
|
PyOS_snprintf(buffer + 8, bufflen - 8, ".%06d", us);
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Wrap functions from the time module. These aren't directly available
|
|
* from C. Perhaps they should be.
|
|
*/
|
|
|
|
/* Call time.time() and return its result (a Python float). */
|
|
static PyObject *
|
|
time_time(void)
|
|
{
|
|
PyObject *result = NULL;
|
|
PyObject *time = PyImport_ImportModule("time");
|
|
|
|
if (time != NULL) {
|
|
result = PyObject_CallMethod(time, "time", "()");
|
|
Py_DECREF(time);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/* Build a time.struct_time. The weekday and day number are automatically
|
|
* computed from the y,m,d args.
|
|
*/
|
|
static PyObject *
|
|
build_struct_time(int y, int m, int d, int hh, int mm, int ss, int dstflag)
|
|
{
|
|
PyObject *time;
|
|
PyObject *result = NULL;
|
|
|
|
time = PyImport_ImportModule("time");
|
|
if (time != NULL) {
|
|
result = PyObject_CallMethod(time, "struct_time",
|
|
"((iiiiiiiii))",
|
|
y, m, d,
|
|
hh, mm, ss,
|
|
weekday(y, m, d),
|
|
days_before_month(y, m) + d,
|
|
dstflag);
|
|
Py_DECREF(time);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Miscellaneous helpers.
|
|
*/
|
|
|
|
/* For various reasons, we need to use tp_richcompare instead of tp_compare.
|
|
* The comparisons here all most naturally compute a cmp()-like result.
|
|
* This little helper turns that into a bool result for rich comparisons.
|
|
*/
|
|
static PyObject *
|
|
diff_to_bool(int diff, int op)
|
|
{
|
|
PyObject *result;
|
|
int istrue;
|
|
|
|
switch (op) {
|
|
case Py_EQ: istrue = diff == 0; break;
|
|
case Py_NE: istrue = diff != 0; break;
|
|
case Py_LE: istrue = diff <= 0; break;
|
|
case Py_GE: istrue = diff >= 0; break;
|
|
case Py_LT: istrue = diff < 0; break;
|
|
case Py_GT: istrue = diff > 0; break;
|
|
default:
|
|
assert(! "op unknown");
|
|
istrue = 0; /* To shut up compiler */
|
|
}
|
|
result = istrue ? Py_True : Py_False;
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
/* Raises a "can't compare" TypeError and returns NULL. */
|
|
static PyObject *
|
|
cmperror(PyObject *a, PyObject *b)
|
|
{
|
|
PyErr_Format(PyExc_TypeError,
|
|
"can't compare %s to %s",
|
|
a->ob_type->tp_name, b->ob_type->tp_name);
|
|
return NULL;
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Cached Python objects; these are set by the module init function.
|
|
*/
|
|
|
|
/* Conversion factors. */
|
|
static PyObject *us_per_us = NULL; /* 1 */
|
|
static PyObject *us_per_ms = NULL; /* 1000 */
|
|
static PyObject *us_per_second = NULL; /* 1000000 */
|
|
static PyObject *us_per_minute = NULL; /* 1e6 * 60 as Python int */
|
|
static PyObject *us_per_hour = NULL; /* 1e6 * 3600 as Python long */
|
|
static PyObject *us_per_day = NULL; /* 1e6 * 3600 * 24 as Python long */
|
|
static PyObject *us_per_week = NULL; /* 1e6*3600*24*7 as Python long */
|
|
static PyObject *seconds_per_day = NULL; /* 3600*24 as Python int */
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Class implementations.
|
|
*/
|
|
|
|
/*
|
|
* PyDateTime_Delta implementation.
|
|
*/
|
|
|
|
/* Convert a timedelta to a number of us,
|
|
* (24*3600*self.days + self.seconds)*1000000 + self.microseconds
|
|
* as a Python int or long.
|
|
* Doing mixed-radix arithmetic by hand instead is excruciating in C,
|
|
* due to ubiquitous overflow possibilities.
|
|
*/
|
|
static PyObject *
|
|
delta_to_microseconds(PyDateTime_Delta *self)
|
|
{
|
|
PyObject *x1 = NULL;
|
|
PyObject *x2 = NULL;
|
|
PyObject *x3 = NULL;
|
|
PyObject *result = NULL;
|
|
|
|
x1 = PyInt_FromLong(GET_TD_DAYS(self));
|
|
if (x1 == NULL)
|
|
goto Done;
|
|
x2 = PyNumber_Multiply(x1, seconds_per_day); /* days in seconds */
|
|
if (x2 == NULL)
|
|
goto Done;
|
|
Py_DECREF(x1);
|
|
x1 = NULL;
|
|
|
|
/* x2 has days in seconds */
|
|
x1 = PyInt_FromLong(GET_TD_SECONDS(self)); /* seconds */
|
|
if (x1 == NULL)
|
|
goto Done;
|
|
x3 = PyNumber_Add(x1, x2); /* days and seconds in seconds */
|
|
if (x3 == NULL)
|
|
goto Done;
|
|
Py_DECREF(x1);
|
|
Py_DECREF(x2);
|
|
x1 = x2 = NULL;
|
|
|
|
/* x3 has days+seconds in seconds */
|
|
x1 = PyNumber_Multiply(x3, us_per_second); /* us */
|
|
if (x1 == NULL)
|
|
goto Done;
|
|
Py_DECREF(x3);
|
|
x3 = NULL;
|
|
|
|
/* x1 has days+seconds in us */
|
|
x2 = PyInt_FromLong(GET_TD_MICROSECONDS(self));
|
|
if (x2 == NULL)
|
|
goto Done;
|
|
result = PyNumber_Add(x1, x2);
|
|
|
|
Done:
|
|
Py_XDECREF(x1);
|
|
Py_XDECREF(x2);
|
|
Py_XDECREF(x3);
|
|
return result;
|
|
}
|
|
|
|
/* Convert a number of us (as a Python int or long) to a timedelta.
|
|
*/
|
|
static PyObject *
|
|
microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
|
|
{
|
|
int us;
|
|
int s;
|
|
int d;
|
|
long temp;
|
|
|
|
PyObject *tuple = NULL;
|
|
PyObject *num = NULL;
|
|
PyObject *result = NULL;
|
|
|
|
tuple = PyNumber_Divmod(pyus, us_per_second);
|
|
if (tuple == NULL)
|
|
goto Done;
|
|
|
|
num = PyTuple_GetItem(tuple, 1); /* us */
|
|
if (num == NULL)
|
|
goto Done;
|
|
temp = PyLong_AsLong(num);
|
|
num = NULL;
|
|
if (temp == -1 && PyErr_Occurred())
|
|
goto Done;
|
|
assert(0 <= temp && temp < 1000000);
|
|
us = (int)temp;
|
|
if (us < 0) {
|
|
/* The divisor was positive, so this must be an error. */
|
|
assert(PyErr_Occurred());
|
|
goto Done;
|
|
}
|
|
|
|
num = PyTuple_GetItem(tuple, 0); /* leftover seconds */
|
|
if (num == NULL)
|
|
goto Done;
|
|
Py_INCREF(num);
|
|
Py_DECREF(tuple);
|
|
|
|
tuple = PyNumber_Divmod(num, seconds_per_day);
|
|
if (tuple == NULL)
|
|
goto Done;
|
|
Py_DECREF(num);
|
|
|
|
num = PyTuple_GetItem(tuple, 1); /* seconds */
|
|
if (num == NULL)
|
|
goto Done;
|
|
temp = PyLong_AsLong(num);
|
|
num = NULL;
|
|
if (temp == -1 && PyErr_Occurred())
|
|
goto Done;
|
|
assert(0 <= temp && temp < 24*3600);
|
|
s = (int)temp;
|
|
|
|
if (s < 0) {
|
|
/* The divisor was positive, so this must be an error. */
|
|
assert(PyErr_Occurred());
|
|
goto Done;
|
|
}
|
|
|
|
num = PyTuple_GetItem(tuple, 0); /* leftover days */
|
|
if (num == NULL)
|
|
goto Done;
|
|
Py_INCREF(num);
|
|
temp = PyLong_AsLong(num);
|
|
if (temp == -1 && PyErr_Occurred())
|
|
goto Done;
|
|
d = (int)temp;
|
|
if ((long)d != temp) {
|
|
PyErr_SetString(PyExc_OverflowError, "normalized days too "
|
|
"large to fit in a C int");
|
|
goto Done;
|
|
}
|
|
result = new_delta_ex(d, s, us, 0, type);
|
|
|
|
Done:
|
|
Py_XDECREF(tuple);
|
|
Py_XDECREF(num);
|
|
return result;
|
|
}
|
|
|
|
#define microseconds_to_delta(pymicros) \
|
|
microseconds_to_delta_ex(pymicros, &PyDateTime_DeltaType)
|
|
|
|
static PyObject *
|
|
multiply_int_timedelta(PyObject *intobj, PyDateTime_Delta *delta)
|
|
{
|
|
PyObject *pyus_in;
|
|
PyObject *pyus_out;
|
|
PyObject *result;
|
|
|
|
pyus_in = delta_to_microseconds(delta);
|
|
if (pyus_in == NULL)
|
|
return NULL;
|
|
|
|
pyus_out = PyNumber_Multiply(pyus_in, intobj);
|
|
Py_DECREF(pyus_in);
|
|
if (pyus_out == NULL)
|
|
return NULL;
|
|
|
|
result = microseconds_to_delta(pyus_out);
|
|
Py_DECREF(pyus_out);
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
divide_timedelta_int(PyDateTime_Delta *delta, PyObject *intobj)
|
|
{
|
|
PyObject *pyus_in;
|
|
PyObject *pyus_out;
|
|
PyObject *result;
|
|
|
|
pyus_in = delta_to_microseconds(delta);
|
|
if (pyus_in == NULL)
|
|
return NULL;
|
|
|
|
pyus_out = PyNumber_FloorDivide(pyus_in, intobj);
|
|
Py_DECREF(pyus_in);
|
|
if (pyus_out == NULL)
|
|
return NULL;
|
|
|
|
result = microseconds_to_delta(pyus_out);
|
|
Py_DECREF(pyus_out);
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
delta_add(PyObject *left, PyObject *right)
|
|
{
|
|
PyObject *result = Py_NotImplemented;
|
|
|
|
if (PyDelta_Check(left) && PyDelta_Check(right)) {
|
|
/* delta + delta */
|
|
/* The C-level additions can't overflow because of the
|
|
* invariant bounds.
|
|
*/
|
|
int days = GET_TD_DAYS(left) + GET_TD_DAYS(right);
|
|
int seconds = GET_TD_SECONDS(left) + GET_TD_SECONDS(right);
|
|
int microseconds = GET_TD_MICROSECONDS(left) +
|
|
GET_TD_MICROSECONDS(right);
|
|
result = new_delta(days, seconds, microseconds, 1);
|
|
}
|
|
|
|
if (result == Py_NotImplemented)
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
delta_negative(PyDateTime_Delta *self)
|
|
{
|
|
return new_delta(-GET_TD_DAYS(self),
|
|
-GET_TD_SECONDS(self),
|
|
-GET_TD_MICROSECONDS(self),
|
|
1);
|
|
}
|
|
|
|
static PyObject *
|
|
delta_positive(PyDateTime_Delta *self)
|
|
{
|
|
/* Could optimize this (by returning self) if this isn't a
|
|
* subclass -- but who uses unary + ? Approximately nobody.
|
|
*/
|
|
return new_delta(GET_TD_DAYS(self),
|
|
GET_TD_SECONDS(self),
|
|
GET_TD_MICROSECONDS(self),
|
|
0);
|
|
}
|
|
|
|
static PyObject *
|
|
delta_abs(PyDateTime_Delta *self)
|
|
{
|
|
PyObject *result;
|
|
|
|
assert(GET_TD_MICROSECONDS(self) >= 0);
|
|
assert(GET_TD_SECONDS(self) >= 0);
|
|
|
|
if (GET_TD_DAYS(self) < 0)
|
|
result = delta_negative(self);
|
|
else
|
|
result = delta_positive(self);
|
|
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
delta_subtract(PyObject *left, PyObject *right)
|
|
{
|
|
PyObject *result = Py_NotImplemented;
|
|
|
|
if (PyDelta_Check(left) && PyDelta_Check(right)) {
|
|
/* delta - delta */
|
|
PyObject *minus_right = PyNumber_Negative(right);
|
|
if (minus_right) {
|
|
result = delta_add(left, minus_right);
|
|
Py_DECREF(minus_right);
|
|
}
|
|
else
|
|
result = NULL;
|
|
}
|
|
|
|
if (result == Py_NotImplemented)
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
delta_richcompare(PyObject *self, PyObject *other, int op)
|
|
{
|
|
if (PyDelta_Check(other)) {
|
|
int diff = GET_TD_DAYS(self) - GET_TD_DAYS(other);
|
|
if (diff == 0) {
|
|
diff = GET_TD_SECONDS(self) - GET_TD_SECONDS(other);
|
|
if (diff == 0)
|
|
diff = GET_TD_MICROSECONDS(self) -
|
|
GET_TD_MICROSECONDS(other);
|
|
}
|
|
return diff_to_bool(diff, op);
|
|
}
|
|
else {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
}
|
|
|
|
static PyObject *delta_getstate(PyDateTime_Delta *self);
|
|
|
|
static long
|
|
delta_hash(PyDateTime_Delta *self)
|
|
{
|
|
if (self->hashcode == -1) {
|
|
PyObject *temp = delta_getstate(self);
|
|
if (temp != NULL) {
|
|
self->hashcode = PyObject_Hash(temp);
|
|
Py_DECREF(temp);
|
|
}
|
|
}
|
|
return self->hashcode;
|
|
}
|
|
|
|
static PyObject *
|
|
delta_multiply(PyObject *left, PyObject *right)
|
|
{
|
|
PyObject *result = Py_NotImplemented;
|
|
|
|
if (PyDelta_Check(left)) {
|
|
/* delta * ??? */
|
|
if (PyInt_Check(right) || PyLong_Check(right))
|
|
result = multiply_int_timedelta(right,
|
|
(PyDateTime_Delta *) left);
|
|
}
|
|
else if (PyInt_Check(left) || PyLong_Check(left))
|
|
result = multiply_int_timedelta(left,
|
|
(PyDateTime_Delta *) right);
|
|
|
|
if (result == Py_NotImplemented)
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
delta_divide(PyObject *left, PyObject *right)
|
|
{
|
|
PyObject *result = Py_NotImplemented;
|
|
|
|
if (PyDelta_Check(left)) {
|
|
/* delta * ??? */
|
|
if (PyInt_Check(right) || PyLong_Check(right))
|
|
result = divide_timedelta_int(
|
|
(PyDateTime_Delta *)left,
|
|
right);
|
|
}
|
|
|
|
if (result == Py_NotImplemented)
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
/* Fold in the value of the tag ("seconds", "weeks", etc) component of a
|
|
* timedelta constructor. sofar is the # of microseconds accounted for
|
|
* so far, and there are factor microseconds per current unit, the number
|
|
* of which is given by num. num * factor is added to sofar in a
|
|
* numerically careful way, and that's the result. Any fractional
|
|
* microseconds left over (this can happen if num is a float type) are
|
|
* added into *leftover.
|
|
* Note that there are many ways this can give an error (NULL) return.
|
|
*/
|
|
static PyObject *
|
|
accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor,
|
|
double *leftover)
|
|
{
|
|
PyObject *prod;
|
|
PyObject *sum;
|
|
|
|
assert(num != NULL);
|
|
|
|
if (PyInt_Check(num) || PyLong_Check(num)) {
|
|
prod = PyNumber_Multiply(num, factor);
|
|
if (prod == NULL)
|
|
return NULL;
|
|
sum = PyNumber_Add(sofar, prod);
|
|
Py_DECREF(prod);
|
|
return sum;
|
|
}
|
|
|
|
if (PyFloat_Check(num)) {
|
|
double dnum;
|
|
double fracpart;
|
|
double intpart;
|
|
PyObject *x;
|
|
PyObject *y;
|
|
|
|
/* The Plan: decompose num into an integer part and a
|
|
* fractional part, num = intpart + fracpart.
|
|
* Then num * factor ==
|
|
* intpart * factor + fracpart * factor
|
|
* and the LHS can be computed exactly in long arithmetic.
|
|
* The RHS is again broken into an int part and frac part.
|
|
* and the frac part is added into *leftover.
|
|
*/
|
|
dnum = PyFloat_AsDouble(num);
|
|
if (dnum == -1.0 && PyErr_Occurred())
|
|
return NULL;
|
|
fracpart = modf(dnum, &intpart);
|
|
x = PyLong_FromDouble(intpart);
|
|
if (x == NULL)
|
|
return NULL;
|
|
|
|
prod = PyNumber_Multiply(x, factor);
|
|
Py_DECREF(x);
|
|
if (prod == NULL)
|
|
return NULL;
|
|
|
|
sum = PyNumber_Add(sofar, prod);
|
|
Py_DECREF(prod);
|
|
if (sum == NULL)
|
|
return NULL;
|
|
|
|
if (fracpart == 0.0)
|
|
return sum;
|
|
/* So far we've lost no information. Dealing with the
|
|
* fractional part requires float arithmetic, and may
|
|
* lose a little info.
|
|
*/
|
|
assert(PyInt_Check(factor) || PyLong_Check(factor));
|
|
dnum = PyLong_AsDouble(factor);
|
|
|
|
dnum *= fracpart;
|
|
fracpart = modf(dnum, &intpart);
|
|
x = PyLong_FromDouble(intpart);
|
|
if (x == NULL) {
|
|
Py_DECREF(sum);
|
|
return NULL;
|
|
}
|
|
|
|
y = PyNumber_Add(sum, x);
|
|
Py_DECREF(sum);
|
|
Py_DECREF(x);
|
|
*leftover += fracpart;
|
|
return y;
|
|
}
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
"unsupported type for timedelta %s component: %s",
|
|
tag, num->ob_type->tp_name);
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
delta_new(PyTypeObject *type, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *self = NULL;
|
|
|
|
/* Argument objects. */
|
|
PyObject *day = NULL;
|
|
PyObject *second = NULL;
|
|
PyObject *us = NULL;
|
|
PyObject *ms = NULL;
|
|
PyObject *minute = NULL;
|
|
PyObject *hour = NULL;
|
|
PyObject *week = NULL;
|
|
|
|
PyObject *x = NULL; /* running sum of microseconds */
|
|
PyObject *y = NULL; /* temp sum of microseconds */
|
|
double leftover_us = 0.0;
|
|
|
|
static char *keywords[] = {
|
|
"days", "seconds", "microseconds", "milliseconds",
|
|
"minutes", "hours", "weeks", NULL
|
|
};
|
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kw, "|OOOOOOO:__new__",
|
|
keywords,
|
|
&day, &second, &us,
|
|
&ms, &minute, &hour, &week) == 0)
|
|
goto Done;
|
|
|
|
x = PyInt_FromLong(0);
|
|
if (x == NULL)
|
|
goto Done;
|
|
|
|
#define CLEANUP \
|
|
Py_DECREF(x); \
|
|
x = y; \
|
|
if (x == NULL) \
|
|
goto Done
|
|
|
|
if (us) {
|
|
y = accum("microseconds", x, us, us_per_us, &leftover_us);
|
|
CLEANUP;
|
|
}
|
|
if (ms) {
|
|
y = accum("milliseconds", x, ms, us_per_ms, &leftover_us);
|
|
CLEANUP;
|
|
}
|
|
if (second) {
|
|
y = accum("seconds", x, second, us_per_second, &leftover_us);
|
|
CLEANUP;
|
|
}
|
|
if (minute) {
|
|
y = accum("minutes", x, minute, us_per_minute, &leftover_us);
|
|
CLEANUP;
|
|
}
|
|
if (hour) {
|
|
y = accum("hours", x, hour, us_per_hour, &leftover_us);
|
|
CLEANUP;
|
|
}
|
|
if (day) {
|
|
y = accum("days", x, day, us_per_day, &leftover_us);
|
|
CLEANUP;
|
|
}
|
|
if (week) {
|
|
y = accum("weeks", x, week, us_per_week, &leftover_us);
|
|
CLEANUP;
|
|
}
|
|
if (leftover_us) {
|
|
/* Round to nearest whole # of us, and add into x. */
|
|
PyObject *temp = PyLong_FromLong(round_to_long(leftover_us));
|
|
if (temp == NULL) {
|
|
Py_DECREF(x);
|
|
goto Done;
|
|
}
|
|
y = PyNumber_Add(x, temp);
|
|
Py_DECREF(temp);
|
|
CLEANUP;
|
|
}
|
|
|
|
self = microseconds_to_delta_ex(x, type);
|
|
Py_DECREF(x);
|
|
Done:
|
|
return self;
|
|
|
|
#undef CLEANUP
|
|
}
|
|
|
|
static int
|
|
delta_bool(PyDateTime_Delta *self)
|
|
{
|
|
return (GET_TD_DAYS(self) != 0
|
|
|| GET_TD_SECONDS(self) != 0
|
|
|| GET_TD_MICROSECONDS(self) != 0);
|
|
}
|
|
|
|
static PyObject *
|
|
delta_repr(PyDateTime_Delta *self)
|
|
{
|
|
if (GET_TD_MICROSECONDS(self) != 0)
|
|
return PyString_FromFormat("%s(%d, %d, %d)",
|
|
self->ob_type->tp_name,
|
|
GET_TD_DAYS(self),
|
|
GET_TD_SECONDS(self),
|
|
GET_TD_MICROSECONDS(self));
|
|
if (GET_TD_SECONDS(self) != 0)
|
|
return PyString_FromFormat("%s(%d, %d)",
|
|
self->ob_type->tp_name,
|
|
GET_TD_DAYS(self),
|
|
GET_TD_SECONDS(self));
|
|
|
|
return PyString_FromFormat("%s(%d)",
|
|
self->ob_type->tp_name,
|
|
GET_TD_DAYS(self));
|
|
}
|
|
|
|
static PyObject *
|
|
delta_str(PyDateTime_Delta *self)
|
|
{
|
|
int days = GET_TD_DAYS(self);
|
|
int seconds = GET_TD_SECONDS(self);
|
|
int us = GET_TD_MICROSECONDS(self);
|
|
int hours;
|
|
int minutes;
|
|
char buf[100];
|
|
char *pbuf = buf;
|
|
size_t buflen = sizeof(buf);
|
|
int n;
|
|
|
|
minutes = divmod(seconds, 60, &seconds);
|
|
hours = divmod(minutes, 60, &minutes);
|
|
|
|
if (days) {
|
|
n = PyOS_snprintf(pbuf, buflen, "%d day%s, ", days,
|
|
(days == 1 || days == -1) ? "" : "s");
|
|
if (n < 0 || (size_t)n >= buflen)
|
|
goto Fail;
|
|
pbuf += n;
|
|
buflen -= (size_t)n;
|
|
}
|
|
|
|
n = PyOS_snprintf(pbuf, buflen, "%d:%02d:%02d",
|
|
hours, minutes, seconds);
|
|
if (n < 0 || (size_t)n >= buflen)
|
|
goto Fail;
|
|
pbuf += n;
|
|
buflen -= (size_t)n;
|
|
|
|
if (us) {
|
|
n = PyOS_snprintf(pbuf, buflen, ".%06d", us);
|
|
if (n < 0 || (size_t)n >= buflen)
|
|
goto Fail;
|
|
pbuf += n;
|
|
}
|
|
|
|
return PyString_FromStringAndSize(buf, pbuf - buf);
|
|
|
|
Fail:
|
|
PyErr_SetString(PyExc_SystemError, "goofy result from PyOS_snprintf");
|
|
return NULL;
|
|
}
|
|
|
|
/* Pickle support, a simple use of __reduce__. */
|
|
|
|
/* __getstate__ isn't exposed */
|
|
static PyObject *
|
|
delta_getstate(PyDateTime_Delta *self)
|
|
{
|
|
return Py_BuildValue("iii", GET_TD_DAYS(self),
|
|
GET_TD_SECONDS(self),
|
|
GET_TD_MICROSECONDS(self));
|
|
}
|
|
|
|
static PyObject *
|
|
delta_reduce(PyDateTime_Delta* self)
|
|
{
|
|
return Py_BuildValue("ON", self->ob_type, delta_getstate(self));
|
|
}
|
|
|
|
#define OFFSET(field) offsetof(PyDateTime_Delta, field)
|
|
|
|
static PyMemberDef delta_members[] = {
|
|
|
|
{"days", T_INT, OFFSET(days), READONLY,
|
|
PyDoc_STR("Number of days.")},
|
|
|
|
{"seconds", T_INT, OFFSET(seconds), READONLY,
|
|
PyDoc_STR("Number of seconds (>= 0 and less than 1 day).")},
|
|
|
|
{"microseconds", T_INT, OFFSET(microseconds), READONLY,
|
|
PyDoc_STR("Number of microseconds (>= 0 and less than 1 second).")},
|
|
{NULL}
|
|
};
|
|
|
|
static PyMethodDef delta_methods[] = {
|
|
{"__reduce__", (PyCFunction)delta_reduce, METH_NOARGS,
|
|
PyDoc_STR("__reduce__() -> (cls, state)")},
|
|
|
|
{NULL, NULL},
|
|
};
|
|
|
|
static char delta_doc[] =
|
|
PyDoc_STR("Difference between two datetime values.");
|
|
|
|
static PyNumberMethods delta_as_number = {
|
|
delta_add, /* nb_add */
|
|
delta_subtract, /* nb_subtract */
|
|
delta_multiply, /* nb_multiply */
|
|
0, /* nb_remainder */
|
|
0, /* nb_divmod */
|
|
0, /* nb_power */
|
|
(unaryfunc)delta_negative, /* nb_negative */
|
|
(unaryfunc)delta_positive, /* nb_positive */
|
|
(unaryfunc)delta_abs, /* nb_absolute */
|
|
(inquiry)delta_bool, /* nb_bool */
|
|
0, /*nb_invert*/
|
|
0, /*nb_lshift*/
|
|
0, /*nb_rshift*/
|
|
0, /*nb_and*/
|
|
0, /*nb_xor*/
|
|
0, /*nb_or*/
|
|
0, /*nb_coerce*/
|
|
0, /*nb_int*/
|
|
0, /*nb_long*/
|
|
0, /*nb_float*/
|
|
0, /*nb_oct*/
|
|
0, /*nb_hex*/
|
|
0, /*nb_inplace_add*/
|
|
0, /*nb_inplace_subtract*/
|
|
0, /*nb_inplace_multiply*/
|
|
0, /*nb_inplace_remainder*/
|
|
0, /*nb_inplace_power*/
|
|
0, /*nb_inplace_lshift*/
|
|
0, /*nb_inplace_rshift*/
|
|
0, /*nb_inplace_and*/
|
|
0, /*nb_inplace_xor*/
|
|
0, /*nb_inplace_or*/
|
|
delta_divide, /* nb_floor_divide */
|
|
0, /* nb_true_divide */
|
|
0, /* nb_inplace_floor_divide */
|
|
0, /* nb_inplace_true_divide */
|
|
};
|
|
|
|
static PyTypeObject PyDateTime_DeltaType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"datetime.timedelta", /* tp_name */
|
|
sizeof(PyDateTime_Delta), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
0, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)delta_repr, /* tp_repr */
|
|
&delta_as_number, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
(hashfunc)delta_hash, /* tp_hash */
|
|
0, /* tp_call */
|
|
(reprfunc)delta_str, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
delta_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
delta_richcompare, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
delta_methods, /* tp_methods */
|
|
delta_members, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0, /* tp_alloc */
|
|
delta_new, /* tp_new */
|
|
0, /* tp_free */
|
|
};
|
|
|
|
/*
|
|
* PyDateTime_Date implementation.
|
|
*/
|
|
|
|
/* Accessor properties. */
|
|
|
|
static PyObject *
|
|
date_year(PyDateTime_Date *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(GET_YEAR(self));
|
|
}
|
|
|
|
static PyObject *
|
|
date_month(PyDateTime_Date *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(GET_MONTH(self));
|
|
}
|
|
|
|
static PyObject *
|
|
date_day(PyDateTime_Date *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(GET_DAY(self));
|
|
}
|
|
|
|
static PyGetSetDef date_getset[] = {
|
|
{"year", (getter)date_year},
|
|
{"month", (getter)date_month},
|
|
{"day", (getter)date_day},
|
|
{NULL}
|
|
};
|
|
|
|
/* Constructors. */
|
|
|
|
static char *date_kws[] = {"year", "month", "day", NULL};
|
|
|
|
static PyObject *
|
|
date_new(PyTypeObject *type, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *self = NULL;
|
|
PyObject *state;
|
|
int year;
|
|
int month;
|
|
int day;
|
|
|
|
/* Check for invocation from pickle with __getstate__ state */
|
|
if (PyTuple_GET_SIZE(args) == 1 &&
|
|
PyString_Check(state = PyTuple_GET_ITEM(args, 0)) &&
|
|
PyString_GET_SIZE(state) == _PyDateTime_DATE_DATASIZE &&
|
|
MONTH_IS_SANE(PyString_AS_STRING(state)[2]))
|
|
{
|
|
PyDateTime_Date *me;
|
|
|
|
me = (PyDateTime_Date *) (type->tp_alloc(type, 0));
|
|
if (me != NULL) {
|
|
char *pdata = PyString_AS_STRING(state);
|
|
memcpy(me->data, pdata, _PyDateTime_DATE_DATASIZE);
|
|
me->hashcode = -1;
|
|
}
|
|
return (PyObject *)me;
|
|
}
|
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kw, "iii", date_kws,
|
|
&year, &month, &day)) {
|
|
if (check_date_args(year, month, day) < 0)
|
|
return NULL;
|
|
self = new_date_ex(year, month, day, type);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
/* Return new date from localtime(t). */
|
|
static PyObject *
|
|
date_local_from_time_t(PyObject *cls, double ts)
|
|
{
|
|
struct tm *tm;
|
|
time_t t;
|
|
PyObject *result = NULL;
|
|
|
|
t = _PyTime_DoubleToTimet(ts);
|
|
if (t == (time_t)-1 && PyErr_Occurred())
|
|
return NULL;
|
|
tm = localtime(&t);
|
|
if (tm)
|
|
result = PyObject_CallFunction(cls, "iii",
|
|
tm->tm_year + 1900,
|
|
tm->tm_mon + 1,
|
|
tm->tm_mday);
|
|
else
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"timestamp out of range for "
|
|
"platform localtime() function");
|
|
return result;
|
|
}
|
|
|
|
/* Return new date from current time.
|
|
* We say this is equivalent to fromtimestamp(time.time()), and the
|
|
* only way to be sure of that is to *call* time.time(). That's not
|
|
* generally the same as calling C's time.
|
|
*/
|
|
static PyObject *
|
|
date_today(PyObject *cls, PyObject *dummy)
|
|
{
|
|
PyObject *time;
|
|
PyObject *result;
|
|
|
|
time = time_time();
|
|
if (time == NULL)
|
|
return NULL;
|
|
|
|
/* Note well: today() is a class method, so this may not call
|
|
* date.fromtimestamp. For example, it may call
|
|
* datetime.fromtimestamp. That's why we need all the accuracy
|
|
* time.time() delivers; if someone were gonzo about optimization,
|
|
* date.today() could get away with plain C time().
|
|
*/
|
|
result = PyObject_CallMethod(cls, "fromtimestamp", "O", time);
|
|
Py_DECREF(time);
|
|
return result;
|
|
}
|
|
|
|
/* Return new date from given timestamp (Python timestamp -- a double). */
|
|
static PyObject *
|
|
date_fromtimestamp(PyObject *cls, PyObject *args)
|
|
{
|
|
double timestamp;
|
|
PyObject *result = NULL;
|
|
|
|
if (PyArg_ParseTuple(args, "d:fromtimestamp", ×tamp))
|
|
result = date_local_from_time_t(cls, timestamp);
|
|
return result;
|
|
}
|
|
|
|
/* Return new date from proleptic Gregorian ordinal. Raises ValueError if
|
|
* the ordinal is out of range.
|
|
*/
|
|
static PyObject *
|
|
date_fromordinal(PyObject *cls, PyObject *args)
|
|
{
|
|
PyObject *result = NULL;
|
|
int ordinal;
|
|
|
|
if (PyArg_ParseTuple(args, "i:fromordinal", &ordinal)) {
|
|
int year;
|
|
int month;
|
|
int day;
|
|
|
|
if (ordinal < 1)
|
|
PyErr_SetString(PyExc_ValueError, "ordinal must be "
|
|
">= 1");
|
|
else {
|
|
ord_to_ymd(ordinal, &year, &month, &day);
|
|
result = PyObject_CallFunction(cls, "iii",
|
|
year, month, day);
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/*
|
|
* Date arithmetic.
|
|
*/
|
|
|
|
/* date + timedelta -> date. If arg negate is true, subtract the timedelta
|
|
* instead.
|
|
*/
|
|
static PyObject *
|
|
add_date_timedelta(PyDateTime_Date *date, PyDateTime_Delta *delta, int negate)
|
|
{
|
|
PyObject *result = NULL;
|
|
int year = GET_YEAR(date);
|
|
int month = GET_MONTH(date);
|
|
int deltadays = GET_TD_DAYS(delta);
|
|
/* C-level overflow is impossible because |deltadays| < 1e9. */
|
|
int day = GET_DAY(date) + (negate ? -deltadays : deltadays);
|
|
|
|
if (normalize_date(&year, &month, &day) >= 0)
|
|
result = new_date(year, month, day);
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
date_add(PyObject *left, PyObject *right)
|
|
{
|
|
if (PyDateTime_Check(left) || PyDateTime_Check(right)) {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
if (PyDate_Check(left)) {
|
|
/* date + ??? */
|
|
if (PyDelta_Check(right))
|
|
/* date + delta */
|
|
return add_date_timedelta((PyDateTime_Date *) left,
|
|
(PyDateTime_Delta *) right,
|
|
0);
|
|
}
|
|
else {
|
|
/* ??? + date
|
|
* 'right' must be one of us, or we wouldn't have been called
|
|
*/
|
|
if (PyDelta_Check(left))
|
|
/* delta + date */
|
|
return add_date_timedelta((PyDateTime_Date *) right,
|
|
(PyDateTime_Delta *) left,
|
|
0);
|
|
}
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
static PyObject *
|
|
date_subtract(PyObject *left, PyObject *right)
|
|
{
|
|
if (PyDateTime_Check(left) || PyDateTime_Check(right)) {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
if (PyDate_Check(left)) {
|
|
if (PyDate_Check(right)) {
|
|
/* date - date */
|
|
int left_ord = ymd_to_ord(GET_YEAR(left),
|
|
GET_MONTH(left),
|
|
GET_DAY(left));
|
|
int right_ord = ymd_to_ord(GET_YEAR(right),
|
|
GET_MONTH(right),
|
|
GET_DAY(right));
|
|
return new_delta(left_ord - right_ord, 0, 0, 0);
|
|
}
|
|
if (PyDelta_Check(right)) {
|
|
/* date - delta */
|
|
return add_date_timedelta((PyDateTime_Date *) left,
|
|
(PyDateTime_Delta *) right,
|
|
1);
|
|
}
|
|
}
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
|
|
/* Various ways to turn a date into a string. */
|
|
|
|
static PyObject *
|
|
date_repr(PyDateTime_Date *self)
|
|
{
|
|
char buffer[1028];
|
|
const char *type_name;
|
|
|
|
type_name = self->ob_type->tp_name;
|
|
PyOS_snprintf(buffer, sizeof(buffer), "%s(%d, %d, %d)",
|
|
type_name,
|
|
GET_YEAR(self), GET_MONTH(self), GET_DAY(self));
|
|
|
|
return PyString_FromString(buffer);
|
|
}
|
|
|
|
static PyObject *
|
|
date_isoformat(PyDateTime_Date *self)
|
|
{
|
|
char buffer[128];
|
|
|
|
isoformat_date(self, buffer, sizeof(buffer));
|
|
return PyString_FromString(buffer);
|
|
}
|
|
|
|
/* str() calls the appropriate isoformat() method. */
|
|
static PyObject *
|
|
date_str(PyDateTime_Date *self)
|
|
{
|
|
return PyObject_CallMethod((PyObject *)self, "isoformat", "()");
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
date_ctime(PyDateTime_Date *self)
|
|
{
|
|
return format_ctime(self, 0, 0, 0);
|
|
}
|
|
|
|
static PyObject *
|
|
date_strftime(PyDateTime_Date *self, PyObject *args, PyObject *kw)
|
|
{
|
|
/* This method can be inherited, and needs to call the
|
|
* timetuple() method appropriate to self's class.
|
|
*/
|
|
PyObject *result;
|
|
PyObject *format;
|
|
PyObject *tuple;
|
|
static char *keywords[] = {"format", NULL};
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kw, "O!:strftime", keywords,
|
|
&PyString_Type, &format))
|
|
return NULL;
|
|
|
|
tuple = PyObject_CallMethod((PyObject *)self, "timetuple", "()");
|
|
if (tuple == NULL)
|
|
return NULL;
|
|
result = wrap_strftime((PyObject *)self, format, tuple,
|
|
(PyObject *)self);
|
|
Py_DECREF(tuple);
|
|
return result;
|
|
}
|
|
|
|
/* ISO methods. */
|
|
|
|
static PyObject *
|
|
date_isoweekday(PyDateTime_Date *self)
|
|
{
|
|
int dow = weekday(GET_YEAR(self), GET_MONTH(self), GET_DAY(self));
|
|
|
|
return PyInt_FromLong(dow + 1);
|
|
}
|
|
|
|
static PyObject *
|
|
date_isocalendar(PyDateTime_Date *self)
|
|
{
|
|
int year = GET_YEAR(self);
|
|
int week1_monday = iso_week1_monday(year);
|
|
int today = ymd_to_ord(year, GET_MONTH(self), GET_DAY(self));
|
|
int week;
|
|
int day;
|
|
|
|
week = divmod(today - week1_monday, 7, &day);
|
|
if (week < 0) {
|
|
--year;
|
|
week1_monday = iso_week1_monday(year);
|
|
week = divmod(today - week1_monday, 7, &day);
|
|
}
|
|
else if (week >= 52 && today >= iso_week1_monday(year + 1)) {
|
|
++year;
|
|
week = 0;
|
|
}
|
|
return Py_BuildValue("iii", year, week + 1, day + 1);
|
|
}
|
|
|
|
/* Miscellaneous methods. */
|
|
|
|
static PyObject *
|
|
date_richcompare(PyObject *self, PyObject *other, int op)
|
|
{
|
|
if (PyDate_Check(other)) {
|
|
int diff = memcmp(((PyDateTime_Date *)self)->data,
|
|
((PyDateTime_Date *)other)->data,
|
|
_PyDateTime_DATE_DATASIZE);
|
|
return diff_to_bool(diff, op);
|
|
}
|
|
else {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
date_timetuple(PyDateTime_Date *self)
|
|
{
|
|
return build_struct_time(GET_YEAR(self),
|
|
GET_MONTH(self),
|
|
GET_DAY(self),
|
|
0, 0, 0, -1);
|
|
}
|
|
|
|
static PyObject *
|
|
date_replace(PyDateTime_Date *self, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *clone;
|
|
PyObject *tuple;
|
|
int year = GET_YEAR(self);
|
|
int month = GET_MONTH(self);
|
|
int day = GET_DAY(self);
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kw, "|iii:replace", date_kws,
|
|
&year, &month, &day))
|
|
return NULL;
|
|
tuple = Py_BuildValue("iii", year, month, day);
|
|
if (tuple == NULL)
|
|
return NULL;
|
|
clone = date_new(self->ob_type, tuple, NULL);
|
|
Py_DECREF(tuple);
|
|
return clone;
|
|
}
|
|
|
|
static PyObject *date_getstate(PyDateTime_Date *self);
|
|
|
|
static long
|
|
date_hash(PyDateTime_Date *self)
|
|
{
|
|
if (self->hashcode == -1) {
|
|
PyObject *temp = date_getstate(self);
|
|
if (temp != NULL) {
|
|
self->hashcode = PyObject_Hash(temp);
|
|
Py_DECREF(temp);
|
|
}
|
|
}
|
|
return self->hashcode;
|
|
}
|
|
|
|
static PyObject *
|
|
date_toordinal(PyDateTime_Date *self)
|
|
{
|
|
return PyInt_FromLong(ymd_to_ord(GET_YEAR(self), GET_MONTH(self),
|
|
GET_DAY(self)));
|
|
}
|
|
|
|
static PyObject *
|
|
date_weekday(PyDateTime_Date *self)
|
|
{
|
|
int dow = weekday(GET_YEAR(self), GET_MONTH(self), GET_DAY(self));
|
|
|
|
return PyInt_FromLong(dow);
|
|
}
|
|
|
|
/* Pickle support, a simple use of __reduce__. */
|
|
|
|
/* __getstate__ isn't exposed */
|
|
static PyObject *
|
|
date_getstate(PyDateTime_Date *self)
|
|
{
|
|
return Py_BuildValue(
|
|
"(N)",
|
|
PyString_FromStringAndSize((char *)self->data,
|
|
_PyDateTime_DATE_DATASIZE));
|
|
}
|
|
|
|
static PyObject *
|
|
date_reduce(PyDateTime_Date *self, PyObject *arg)
|
|
{
|
|
return Py_BuildValue("(ON)", self->ob_type, date_getstate(self));
|
|
}
|
|
|
|
static PyMethodDef date_methods[] = {
|
|
|
|
/* Class methods: */
|
|
|
|
{"fromtimestamp", (PyCFunction)date_fromtimestamp, METH_VARARGS |
|
|
METH_CLASS,
|
|
PyDoc_STR("timestamp -> local date from a POSIX timestamp (like "
|
|
"time.time()).")},
|
|
|
|
{"fromordinal", (PyCFunction)date_fromordinal, METH_VARARGS |
|
|
METH_CLASS,
|
|
PyDoc_STR("int -> date corresponding to a proleptic Gregorian "
|
|
"ordinal.")},
|
|
|
|
{"today", (PyCFunction)date_today, METH_NOARGS | METH_CLASS,
|
|
PyDoc_STR("Current date or datetime: same as "
|
|
"self.__class__.fromtimestamp(time.time()).")},
|
|
|
|
/* Instance methods: */
|
|
|
|
{"ctime", (PyCFunction)date_ctime, METH_NOARGS,
|
|
PyDoc_STR("Return ctime() style string.")},
|
|
|
|
{"strftime", (PyCFunction)date_strftime, METH_KEYWORDS,
|
|
PyDoc_STR("format -> strftime() style string.")},
|
|
|
|
{"timetuple", (PyCFunction)date_timetuple, METH_NOARGS,
|
|
PyDoc_STR("Return time tuple, compatible with time.localtime().")},
|
|
|
|
{"isocalendar", (PyCFunction)date_isocalendar, METH_NOARGS,
|
|
PyDoc_STR("Return a 3-tuple containing ISO year, week number, and "
|
|
"weekday.")},
|
|
|
|
{"isoformat", (PyCFunction)date_isoformat, METH_NOARGS,
|
|
PyDoc_STR("Return string in ISO 8601 format, YYYY-MM-DD.")},
|
|
|
|
{"isoweekday", (PyCFunction)date_isoweekday, METH_NOARGS,
|
|
PyDoc_STR("Return the day of the week represented by the date.\n"
|
|
"Monday == 1 ... Sunday == 7")},
|
|
|
|
{"toordinal", (PyCFunction)date_toordinal, METH_NOARGS,
|
|
PyDoc_STR("Return proleptic Gregorian ordinal. January 1 of year "
|
|
"1 is day 1.")},
|
|
|
|
{"weekday", (PyCFunction)date_weekday, METH_NOARGS,
|
|
PyDoc_STR("Return the day of the week represented by the date.\n"
|
|
"Monday == 0 ... Sunday == 6")},
|
|
|
|
{"replace", (PyCFunction)date_replace, METH_KEYWORDS,
|
|
PyDoc_STR("Return date with new specified fields.")},
|
|
|
|
{"__reduce__", (PyCFunction)date_reduce, METH_NOARGS,
|
|
PyDoc_STR("__reduce__() -> (cls, state)")},
|
|
|
|
{NULL, NULL}
|
|
};
|
|
|
|
static char date_doc[] =
|
|
PyDoc_STR("date(year, month, day) --> date object");
|
|
|
|
static PyNumberMethods date_as_number = {
|
|
date_add, /* nb_add */
|
|
date_subtract, /* nb_subtract */
|
|
0, /* nb_multiply */
|
|
0, /* nb_remainder */
|
|
0, /* nb_divmod */
|
|
0, /* nb_power */
|
|
0, /* nb_negative */
|
|
0, /* nb_positive */
|
|
0, /* nb_absolute */
|
|
0, /* nb_bool */
|
|
};
|
|
|
|
static PyTypeObject PyDateTime_DateType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"datetime.date", /* tp_name */
|
|
sizeof(PyDateTime_Date), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
0, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)date_repr, /* tp_repr */
|
|
&date_as_number, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
(hashfunc)date_hash, /* tp_hash */
|
|
0, /* tp_call */
|
|
(reprfunc)date_str, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
date_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
date_richcompare, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
date_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
date_getset, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0, /* tp_alloc */
|
|
date_new, /* tp_new */
|
|
0, /* tp_free */
|
|
};
|
|
|
|
/*
|
|
* PyDateTime_TZInfo implementation.
|
|
*/
|
|
|
|
/* This is a pure abstract base class, so doesn't do anything beyond
|
|
* raising NotImplemented exceptions. Real tzinfo classes need
|
|
* to derive from this. This is mostly for clarity, and for efficiency in
|
|
* datetime and time constructors (their tzinfo arguments need to
|
|
* be subclasses of this tzinfo class, which is easy and quick to check).
|
|
*
|
|
* Note: For reasons having to do with pickling of subclasses, we have
|
|
* to allow tzinfo objects to be instantiated. This wasn't an issue
|
|
* in the Python implementation (__init__() could raise NotImplementedError
|
|
* there without ill effect), but doing so in the C implementation hit a
|
|
* brick wall.
|
|
*/
|
|
|
|
static PyObject *
|
|
tzinfo_nogo(const char* methodname)
|
|
{
|
|
PyErr_Format(PyExc_NotImplementedError,
|
|
"a tzinfo subclass must implement %s()",
|
|
methodname);
|
|
return NULL;
|
|
}
|
|
|
|
/* Methods. A subclass must implement these. */
|
|
|
|
static PyObject *
|
|
tzinfo_tzname(PyDateTime_TZInfo *self, PyObject *dt)
|
|
{
|
|
return tzinfo_nogo("tzname");
|
|
}
|
|
|
|
static PyObject *
|
|
tzinfo_utcoffset(PyDateTime_TZInfo *self, PyObject *dt)
|
|
{
|
|
return tzinfo_nogo("utcoffset");
|
|
}
|
|
|
|
static PyObject *
|
|
tzinfo_dst(PyDateTime_TZInfo *self, PyObject *dt)
|
|
{
|
|
return tzinfo_nogo("dst");
|
|
}
|
|
|
|
static PyObject *
|
|
tzinfo_fromutc(PyDateTime_TZInfo *self, PyDateTime_DateTime *dt)
|
|
{
|
|
int y, m, d, hh, mm, ss, us;
|
|
|
|
PyObject *result;
|
|
int off, dst;
|
|
int none;
|
|
int delta;
|
|
|
|
if (! PyDateTime_Check(dt)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"fromutc: argument must be a datetime");
|
|
return NULL;
|
|
}
|
|
if (! HASTZINFO(dt) || dt->tzinfo != (PyObject *)self) {
|
|
PyErr_SetString(PyExc_ValueError, "fromutc: dt.tzinfo "
|
|
"is not self");
|
|
return NULL;
|
|
}
|
|
|
|
off = call_utcoffset(dt->tzinfo, (PyObject *)dt, &none);
|
|
if (off == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
if (none) {
|
|
PyErr_SetString(PyExc_ValueError, "fromutc: non-None "
|
|
"utcoffset() result required");
|
|
return NULL;
|
|
}
|
|
|
|
dst = call_dst(dt->tzinfo, (PyObject *)dt, &none);
|
|
if (dst == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
if (none) {
|
|
PyErr_SetString(PyExc_ValueError, "fromutc: non-None "
|
|
"dst() result required");
|
|
return NULL;
|
|
}
|
|
|
|
y = GET_YEAR(dt);
|
|
m = GET_MONTH(dt);
|
|
d = GET_DAY(dt);
|
|
hh = DATE_GET_HOUR(dt);
|
|
mm = DATE_GET_MINUTE(dt);
|
|
ss = DATE_GET_SECOND(dt);
|
|
us = DATE_GET_MICROSECOND(dt);
|
|
|
|
delta = off - dst;
|
|
mm += delta;
|
|
if ((mm < 0 || mm >= 60) &&
|
|
normalize_datetime(&y, &m, &d, &hh, &mm, &ss, &us) < 0)
|
|
return NULL;
|
|
result = new_datetime(y, m, d, hh, mm, ss, us, dt->tzinfo);
|
|
if (result == NULL)
|
|
return result;
|
|
|
|
dst = call_dst(dt->tzinfo, result, &none);
|
|
if (dst == -1 && PyErr_Occurred())
|
|
goto Fail;
|
|
if (none)
|
|
goto Inconsistent;
|
|
if (dst == 0)
|
|
return result;
|
|
|
|
mm += dst;
|
|
if ((mm < 0 || mm >= 60) &&
|
|
normalize_datetime(&y, &m, &d, &hh, &mm, &ss, &us) < 0)
|
|
goto Fail;
|
|
Py_DECREF(result);
|
|
result = new_datetime(y, m, d, hh, mm, ss, us, dt->tzinfo);
|
|
return result;
|
|
|
|
Inconsistent:
|
|
PyErr_SetString(PyExc_ValueError, "fromutc: tz.dst() gave"
|
|
"inconsistent results; cannot convert");
|
|
|
|
/* fall thru to failure */
|
|
Fail:
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Pickle support. This is solely so that tzinfo subclasses can use
|
|
* pickling -- tzinfo itself is supposed to be uninstantiable.
|
|
*/
|
|
|
|
static PyObject *
|
|
tzinfo_reduce(PyObject *self)
|
|
{
|
|
PyObject *args, *state, *tmp;
|
|
PyObject *getinitargs, *getstate;
|
|
|
|
tmp = PyTuple_New(0);
|
|
if (tmp == NULL)
|
|
return NULL;
|
|
|
|
getinitargs = PyObject_GetAttrString(self, "__getinitargs__");
|
|
if (getinitargs != NULL) {
|
|
args = PyObject_CallObject(getinitargs, tmp);
|
|
Py_DECREF(getinitargs);
|
|
if (args == NULL) {
|
|
Py_DECREF(tmp);
|
|
return NULL;
|
|
}
|
|
}
|
|
else {
|
|
PyErr_Clear();
|
|
args = tmp;
|
|
Py_INCREF(args);
|
|
}
|
|
|
|
getstate = PyObject_GetAttrString(self, "__getstate__");
|
|
if (getstate != NULL) {
|
|
state = PyObject_CallObject(getstate, tmp);
|
|
Py_DECREF(getstate);
|
|
if (state == NULL) {
|
|
Py_DECREF(args);
|
|
Py_DECREF(tmp);
|
|
return NULL;
|
|
}
|
|
}
|
|
else {
|
|
PyObject **dictptr;
|
|
PyErr_Clear();
|
|
state = Py_None;
|
|
dictptr = _PyObject_GetDictPtr(self);
|
|
if (dictptr && *dictptr && PyDict_Size(*dictptr))
|
|
state = *dictptr;
|
|
Py_INCREF(state);
|
|
}
|
|
|
|
Py_DECREF(tmp);
|
|
|
|
if (state == Py_None) {
|
|
Py_DECREF(state);
|
|
return Py_BuildValue("(ON)", self->ob_type, args);
|
|
}
|
|
else
|
|
return Py_BuildValue("(ONN)", self->ob_type, args, state);
|
|
}
|
|
|
|
static PyMethodDef tzinfo_methods[] = {
|
|
|
|
{"tzname", (PyCFunction)tzinfo_tzname, METH_O,
|
|
PyDoc_STR("datetime -> string name of time zone.")},
|
|
|
|
{"utcoffset", (PyCFunction)tzinfo_utcoffset, METH_O,
|
|
PyDoc_STR("datetime -> minutes east of UTC (negative for "
|
|
"west of UTC).")},
|
|
|
|
{"dst", (PyCFunction)tzinfo_dst, METH_O,
|
|
PyDoc_STR("datetime -> DST offset in minutes east of UTC.")},
|
|
|
|
{"fromutc", (PyCFunction)tzinfo_fromutc, METH_O,
|
|
PyDoc_STR("datetime in UTC -> datetime in local time.")},
|
|
|
|
{"__reduce__", (PyCFunction)tzinfo_reduce, METH_NOARGS,
|
|
PyDoc_STR("-> (cls, state)")},
|
|
|
|
{NULL, NULL}
|
|
};
|
|
|
|
static char tzinfo_doc[] =
|
|
PyDoc_STR("Abstract base class for time zone info objects.");
|
|
|
|
static PyTypeObject PyDateTime_TZInfoType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"datetime.tzinfo", /* tp_name */
|
|
sizeof(PyDateTime_TZInfo), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
0, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
tzinfo_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
tzinfo_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0, /* tp_alloc */
|
|
PyType_GenericNew, /* tp_new */
|
|
0, /* tp_free */
|
|
};
|
|
|
|
/*
|
|
* PyDateTime_Time implementation.
|
|
*/
|
|
|
|
/* Accessor properties.
|
|
*/
|
|
|
|
static PyObject *
|
|
time_hour(PyDateTime_Time *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(TIME_GET_HOUR(self));
|
|
}
|
|
|
|
static PyObject *
|
|
time_minute(PyDateTime_Time *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(TIME_GET_MINUTE(self));
|
|
}
|
|
|
|
/* The name time_second conflicted with some platform header file. */
|
|
static PyObject *
|
|
py_time_second(PyDateTime_Time *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(TIME_GET_SECOND(self));
|
|
}
|
|
|
|
static PyObject *
|
|
time_microsecond(PyDateTime_Time *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(TIME_GET_MICROSECOND(self));
|
|
}
|
|
|
|
static PyObject *
|
|
time_tzinfo(PyDateTime_Time *self, void *unused)
|
|
{
|
|
PyObject *result = HASTZINFO(self) ? self->tzinfo : Py_None;
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
static PyGetSetDef time_getset[] = {
|
|
{"hour", (getter)time_hour},
|
|
{"minute", (getter)time_minute},
|
|
{"second", (getter)py_time_second},
|
|
{"microsecond", (getter)time_microsecond},
|
|
{"tzinfo", (getter)time_tzinfo},
|
|
{NULL}
|
|
};
|
|
|
|
/*
|
|
* Constructors.
|
|
*/
|
|
|
|
static char *time_kws[] = {"hour", "minute", "second", "microsecond",
|
|
"tzinfo", NULL};
|
|
|
|
static PyObject *
|
|
time_new(PyTypeObject *type, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *self = NULL;
|
|
PyObject *state;
|
|
int hour = 0;
|
|
int minute = 0;
|
|
int second = 0;
|
|
int usecond = 0;
|
|
PyObject *tzinfo = Py_None;
|
|
|
|
/* Check for invocation from pickle with __getstate__ state */
|
|
if (PyTuple_GET_SIZE(args) >= 1 &&
|
|
PyTuple_GET_SIZE(args) <= 2 &&
|
|
PyString_Check(state = PyTuple_GET_ITEM(args, 0)) &&
|
|
PyString_GET_SIZE(state) == _PyDateTime_TIME_DATASIZE &&
|
|
((unsigned char) (PyString_AS_STRING(state)[0])) < 24)
|
|
{
|
|
PyDateTime_Time *me;
|
|
char aware;
|
|
|
|
if (PyTuple_GET_SIZE(args) == 2) {
|
|
tzinfo = PyTuple_GET_ITEM(args, 1);
|
|
if (check_tzinfo_subclass(tzinfo) < 0) {
|
|
PyErr_SetString(PyExc_TypeError, "bad "
|
|
"tzinfo state arg");
|
|
return NULL;
|
|
}
|
|
}
|
|
aware = (char)(tzinfo != Py_None);
|
|
me = (PyDateTime_Time *) (type->tp_alloc(type, aware));
|
|
if (me != NULL) {
|
|
char *pdata = PyString_AS_STRING(state);
|
|
|
|
memcpy(me->data, pdata, _PyDateTime_TIME_DATASIZE);
|
|
me->hashcode = -1;
|
|
me->hastzinfo = aware;
|
|
if (aware) {
|
|
Py_INCREF(tzinfo);
|
|
me->tzinfo = tzinfo;
|
|
}
|
|
}
|
|
return (PyObject *)me;
|
|
}
|
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kw, "|iiiiO", time_kws,
|
|
&hour, &minute, &second, &usecond,
|
|
&tzinfo)) {
|
|
if (check_time_args(hour, minute, second, usecond) < 0)
|
|
return NULL;
|
|
if (check_tzinfo_subclass(tzinfo) < 0)
|
|
return NULL;
|
|
self = new_time_ex(hour, minute, second, usecond, tzinfo,
|
|
type);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
/*
|
|
* Destructor.
|
|
*/
|
|
|
|
static void
|
|
time_dealloc(PyDateTime_Time *self)
|
|
{
|
|
if (HASTZINFO(self)) {
|
|
Py_XDECREF(self->tzinfo);
|
|
}
|
|
self->ob_type->tp_free((PyObject *)self);
|
|
}
|
|
|
|
/*
|
|
* Indirect access to tzinfo methods.
|
|
*/
|
|
|
|
/* These are all METH_NOARGS, so don't need to check the arglist. */
|
|
static PyObject *
|
|
time_utcoffset(PyDateTime_Time *self, PyObject *unused) {
|
|
return offset_as_timedelta(HASTZINFO(self) ? self->tzinfo : Py_None,
|
|
"utcoffset", Py_None);
|
|
}
|
|
|
|
static PyObject *
|
|
time_dst(PyDateTime_Time *self, PyObject *unused) {
|
|
return offset_as_timedelta(HASTZINFO(self) ? self->tzinfo : Py_None,
|
|
"dst", Py_None);
|
|
}
|
|
|
|
static PyObject *
|
|
time_tzname(PyDateTime_Time *self, PyObject *unused) {
|
|
return call_tzname(HASTZINFO(self) ? self->tzinfo : Py_None,
|
|
Py_None);
|
|
}
|
|
|
|
/*
|
|
* Various ways to turn a time into a string.
|
|
*/
|
|
|
|
static PyObject *
|
|
time_repr(PyDateTime_Time *self)
|
|
{
|
|
char buffer[100];
|
|
const char *type_name = self->ob_type->tp_name;
|
|
int h = TIME_GET_HOUR(self);
|
|
int m = TIME_GET_MINUTE(self);
|
|
int s = TIME_GET_SECOND(self);
|
|
int us = TIME_GET_MICROSECOND(self);
|
|
PyObject *result = NULL;
|
|
|
|
if (us)
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
|
"%s(%d, %d, %d, %d)", type_name, h, m, s, us);
|
|
else if (s)
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
|
"%s(%d, %d, %d)", type_name, h, m, s);
|
|
else
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
|
"%s(%d, %d)", type_name, h, m);
|
|
result = PyString_FromString(buffer);
|
|
if (result != NULL && HASTZINFO(self))
|
|
result = append_keyword_tzinfo(result, self->tzinfo);
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
time_str(PyDateTime_Time *self)
|
|
{
|
|
return PyObject_CallMethod((PyObject *)self, "isoformat", "()");
|
|
}
|
|
|
|
static PyObject *
|
|
time_isoformat(PyDateTime_Time *self, PyObject *unused)
|
|
{
|
|
char buf[100];
|
|
PyObject *result;
|
|
/* Reuse the time format code from the datetime type. */
|
|
PyDateTime_DateTime datetime;
|
|
PyDateTime_DateTime *pdatetime = &datetime;
|
|
|
|
/* Copy over just the time bytes. */
|
|
memcpy(pdatetime->data + _PyDateTime_DATE_DATASIZE,
|
|
self->data,
|
|
_PyDateTime_TIME_DATASIZE);
|
|
|
|
isoformat_time(pdatetime, buf, sizeof(buf));
|
|
result = PyString_FromString(buf);
|
|
if (result == NULL || ! HASTZINFO(self) || self->tzinfo == Py_None)
|
|
return result;
|
|
|
|
/* We need to append the UTC offset. */
|
|
if (format_utcoffset(buf, sizeof(buf), ":", self->tzinfo,
|
|
Py_None) < 0) {
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
PyString_ConcatAndDel(&result, PyString_FromString(buf));
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
time_strftime(PyDateTime_Time *self, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *result;
|
|
PyObject *format;
|
|
PyObject *tuple;
|
|
static char *keywords[] = {"format", NULL};
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kw, "O!:strftime", keywords,
|
|
&PyString_Type, &format))
|
|
return NULL;
|
|
|
|
/* Python's strftime does insane things with the year part of the
|
|
* timetuple. The year is forced to (the otherwise nonsensical)
|
|
* 1900 to worm around that.
|
|
*/
|
|
tuple = Py_BuildValue("iiiiiiiii",
|
|
1900, 1, 1, /* year, month, day */
|
|
TIME_GET_HOUR(self),
|
|
TIME_GET_MINUTE(self),
|
|
TIME_GET_SECOND(self),
|
|
0, 1, -1); /* weekday, daynum, dst */
|
|
if (tuple == NULL)
|
|
return NULL;
|
|
assert(PyTuple_Size(tuple) == 9);
|
|
result = wrap_strftime((PyObject *)self, format, tuple, Py_None);
|
|
Py_DECREF(tuple);
|
|
return result;
|
|
}
|
|
|
|
/*
|
|
* Miscellaneous methods.
|
|
*/
|
|
|
|
static PyObject *
|
|
time_richcompare(PyObject *self, PyObject *other, int op)
|
|
{
|
|
int diff;
|
|
naivety n1, n2;
|
|
int offset1, offset2;
|
|
|
|
if (! PyTime_Check(other)) {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
if (classify_two_utcoffsets(self, &offset1, &n1, Py_None,
|
|
other, &offset2, &n2, Py_None) < 0)
|
|
return NULL;
|
|
assert(n1 != OFFSET_UNKNOWN && n2 != OFFSET_UNKNOWN);
|
|
/* If they're both naive, or both aware and have the same offsets,
|
|
* we get off cheap. Note that if they're both naive, offset1 ==
|
|
* offset2 == 0 at this point.
|
|
*/
|
|
if (n1 == n2 && offset1 == offset2) {
|
|
diff = memcmp(((PyDateTime_Time *)self)->data,
|
|
((PyDateTime_Time *)other)->data,
|
|
_PyDateTime_TIME_DATASIZE);
|
|
return diff_to_bool(diff, op);
|
|
}
|
|
|
|
if (n1 == OFFSET_AWARE && n2 == OFFSET_AWARE) {
|
|
assert(offset1 != offset2); /* else last "if" handled it */
|
|
/* Convert everything except microseconds to seconds. These
|
|
* can't overflow (no more than the # of seconds in 2 days).
|
|
*/
|
|
offset1 = TIME_GET_HOUR(self) * 3600 +
|
|
(TIME_GET_MINUTE(self) - offset1) * 60 +
|
|
TIME_GET_SECOND(self);
|
|
offset2 = TIME_GET_HOUR(other) * 3600 +
|
|
(TIME_GET_MINUTE(other) - offset2) * 60 +
|
|
TIME_GET_SECOND(other);
|
|
diff = offset1 - offset2;
|
|
if (diff == 0)
|
|
diff = TIME_GET_MICROSECOND(self) -
|
|
TIME_GET_MICROSECOND(other);
|
|
return diff_to_bool(diff, op);
|
|
}
|
|
|
|
assert(n1 != n2);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"can't compare offset-naive and "
|
|
"offset-aware times");
|
|
return NULL;
|
|
}
|
|
|
|
static long
|
|
time_hash(PyDateTime_Time *self)
|
|
{
|
|
if (self->hashcode == -1) {
|
|
naivety n;
|
|
int offset;
|
|
PyObject *temp;
|
|
|
|
n = classify_utcoffset((PyObject *)self, Py_None, &offset);
|
|
assert(n != OFFSET_UNKNOWN);
|
|
if (n == OFFSET_ERROR)
|
|
return -1;
|
|
|
|
/* Reduce this to a hash of another object. */
|
|
if (offset == 0)
|
|
temp = PyString_FromStringAndSize((char *)self->data,
|
|
_PyDateTime_TIME_DATASIZE);
|
|
else {
|
|
int hour;
|
|
int minute;
|
|
|
|
assert(n == OFFSET_AWARE);
|
|
assert(HASTZINFO(self));
|
|
hour = divmod(TIME_GET_HOUR(self) * 60 +
|
|
TIME_GET_MINUTE(self) - offset,
|
|
60,
|
|
&minute);
|
|
if (0 <= hour && hour < 24)
|
|
temp = new_time(hour, minute,
|
|
TIME_GET_SECOND(self),
|
|
TIME_GET_MICROSECOND(self),
|
|
Py_None);
|
|
else
|
|
temp = Py_BuildValue("iiii",
|
|
hour, minute,
|
|
TIME_GET_SECOND(self),
|
|
TIME_GET_MICROSECOND(self));
|
|
}
|
|
if (temp != NULL) {
|
|
self->hashcode = PyObject_Hash(temp);
|
|
Py_DECREF(temp);
|
|
}
|
|
}
|
|
return self->hashcode;
|
|
}
|
|
|
|
static PyObject *
|
|
time_replace(PyDateTime_Time *self, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *clone;
|
|
PyObject *tuple;
|
|
int hh = TIME_GET_HOUR(self);
|
|
int mm = TIME_GET_MINUTE(self);
|
|
int ss = TIME_GET_SECOND(self);
|
|
int us = TIME_GET_MICROSECOND(self);
|
|
PyObject *tzinfo = HASTZINFO(self) ? self->tzinfo : Py_None;
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kw, "|iiiiO:replace",
|
|
time_kws,
|
|
&hh, &mm, &ss, &us, &tzinfo))
|
|
return NULL;
|
|
tuple = Py_BuildValue("iiiiO", hh, mm, ss, us, tzinfo);
|
|
if (tuple == NULL)
|
|
return NULL;
|
|
clone = time_new(self->ob_type, tuple, NULL);
|
|
Py_DECREF(tuple);
|
|
return clone;
|
|
}
|
|
|
|
static int
|
|
time_bool(PyDateTime_Time *self)
|
|
{
|
|
int offset;
|
|
int none;
|
|
|
|
if (TIME_GET_SECOND(self) || TIME_GET_MICROSECOND(self)) {
|
|
/* Since utcoffset is in whole minutes, nothing can
|
|
* alter the conclusion that this is nonzero.
|
|
*/
|
|
return 1;
|
|
}
|
|
offset = 0;
|
|
if (HASTZINFO(self) && self->tzinfo != Py_None) {
|
|
offset = call_utcoffset(self->tzinfo, Py_None, &none);
|
|
if (offset == -1 && PyErr_Occurred())
|
|
return -1;
|
|
}
|
|
return (TIME_GET_MINUTE(self) - offset + TIME_GET_HOUR(self)*60) != 0;
|
|
}
|
|
|
|
/* Pickle support, a simple use of __reduce__. */
|
|
|
|
/* Let basestate be the non-tzinfo data string.
|
|
* If tzinfo is None, this returns (basestate,), else (basestate, tzinfo).
|
|
* So it's a tuple in any (non-error) case.
|
|
* __getstate__ isn't exposed.
|
|
*/
|
|
static PyObject *
|
|
time_getstate(PyDateTime_Time *self)
|
|
{
|
|
PyObject *basestate;
|
|
PyObject *result = NULL;
|
|
|
|
basestate = PyString_FromStringAndSize((char *)self->data,
|
|
_PyDateTime_TIME_DATASIZE);
|
|
if (basestate != NULL) {
|
|
if (! HASTZINFO(self) || self->tzinfo == Py_None)
|
|
result = PyTuple_Pack(1, basestate);
|
|
else
|
|
result = PyTuple_Pack(2, basestate, self->tzinfo);
|
|
Py_DECREF(basestate);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
time_reduce(PyDateTime_Time *self, PyObject *arg)
|
|
{
|
|
return Py_BuildValue("(ON)", self->ob_type, time_getstate(self));
|
|
}
|
|
|
|
static PyMethodDef time_methods[] = {
|
|
|
|
{"isoformat", (PyCFunction)time_isoformat, METH_NOARGS,
|
|
PyDoc_STR("Return string in ISO 8601 format, HH:MM:SS[.mmmmmm]"
|
|
"[+HH:MM].")},
|
|
|
|
{"strftime", (PyCFunction)time_strftime, METH_KEYWORDS,
|
|
PyDoc_STR("format -> strftime() style string.")},
|
|
|
|
{"utcoffset", (PyCFunction)time_utcoffset, METH_NOARGS,
|
|
PyDoc_STR("Return self.tzinfo.utcoffset(self).")},
|
|
|
|
{"tzname", (PyCFunction)time_tzname, METH_NOARGS,
|
|
PyDoc_STR("Return self.tzinfo.tzname(self).")},
|
|
|
|
{"dst", (PyCFunction)time_dst, METH_NOARGS,
|
|
PyDoc_STR("Return self.tzinfo.dst(self).")},
|
|
|
|
{"replace", (PyCFunction)time_replace, METH_KEYWORDS,
|
|
PyDoc_STR("Return time with new specified fields.")},
|
|
|
|
{"__reduce__", (PyCFunction)time_reduce, METH_NOARGS,
|
|
PyDoc_STR("__reduce__() -> (cls, state)")},
|
|
|
|
{NULL, NULL}
|
|
};
|
|
|
|
static char time_doc[] =
|
|
PyDoc_STR("time([hour[, minute[, second[, microsecond[, tzinfo]]]]]) --> a time object\n\
|
|
\n\
|
|
All arguments are optional. tzinfo may be None, or an instance of\n\
|
|
a tzinfo subclass. The remaining arguments may be ints or longs.\n");
|
|
|
|
static PyNumberMethods time_as_number = {
|
|
0, /* nb_add */
|
|
0, /* nb_subtract */
|
|
0, /* nb_multiply */
|
|
0, /* nb_remainder */
|
|
0, /* nb_divmod */
|
|
0, /* nb_power */
|
|
0, /* nb_negative */
|
|
0, /* nb_positive */
|
|
0, /* nb_absolute */
|
|
(inquiry)time_bool, /* nb_bool */
|
|
};
|
|
|
|
static PyTypeObject PyDateTime_TimeType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"datetime.time", /* tp_name */
|
|
sizeof(PyDateTime_Time), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)time_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)time_repr, /* tp_repr */
|
|
&time_as_number, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
(hashfunc)time_hash, /* tp_hash */
|
|
0, /* tp_call */
|
|
(reprfunc)time_str, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
time_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
time_richcompare, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
time_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
time_getset, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
time_alloc, /* tp_alloc */
|
|
time_new, /* tp_new */
|
|
0, /* tp_free */
|
|
};
|
|
|
|
/*
|
|
* PyDateTime_DateTime implementation.
|
|
*/
|
|
|
|
/* Accessor properties. Properties for day, month, and year are inherited
|
|
* from date.
|
|
*/
|
|
|
|
static PyObject *
|
|
datetime_hour(PyDateTime_DateTime *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(DATE_GET_HOUR(self));
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_minute(PyDateTime_DateTime *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(DATE_GET_MINUTE(self));
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_second(PyDateTime_DateTime *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(DATE_GET_SECOND(self));
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_microsecond(PyDateTime_DateTime *self, void *unused)
|
|
{
|
|
return PyInt_FromLong(DATE_GET_MICROSECOND(self));
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_tzinfo(PyDateTime_DateTime *self, void *unused)
|
|
{
|
|
PyObject *result = HASTZINFO(self) ? self->tzinfo : Py_None;
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
static PyGetSetDef datetime_getset[] = {
|
|
{"hour", (getter)datetime_hour},
|
|
{"minute", (getter)datetime_minute},
|
|
{"second", (getter)datetime_second},
|
|
{"microsecond", (getter)datetime_microsecond},
|
|
{"tzinfo", (getter)datetime_tzinfo},
|
|
{NULL}
|
|
};
|
|
|
|
/*
|
|
* Constructors.
|
|
*/
|
|
|
|
static char *datetime_kws[] = {
|
|
"year", "month", "day", "hour", "minute", "second",
|
|
"microsecond", "tzinfo", NULL
|
|
};
|
|
|
|
static PyObject *
|
|
datetime_new(PyTypeObject *type, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *self = NULL;
|
|
PyObject *state;
|
|
int year;
|
|
int month;
|
|
int day;
|
|
int hour = 0;
|
|
int minute = 0;
|
|
int second = 0;
|
|
int usecond = 0;
|
|
PyObject *tzinfo = Py_None;
|
|
|
|
/* Check for invocation from pickle with __getstate__ state */
|
|
if (PyTuple_GET_SIZE(args) >= 1 &&
|
|
PyTuple_GET_SIZE(args) <= 2 &&
|
|
PyString_Check(state = PyTuple_GET_ITEM(args, 0)) &&
|
|
PyString_GET_SIZE(state) == _PyDateTime_DATETIME_DATASIZE &&
|
|
MONTH_IS_SANE(PyString_AS_STRING(state)[2]))
|
|
{
|
|
PyDateTime_DateTime *me;
|
|
char aware;
|
|
|
|
if (PyTuple_GET_SIZE(args) == 2) {
|
|
tzinfo = PyTuple_GET_ITEM(args, 1);
|
|
if (check_tzinfo_subclass(tzinfo) < 0) {
|
|
PyErr_SetString(PyExc_TypeError, "bad "
|
|
"tzinfo state arg");
|
|
return NULL;
|
|
}
|
|
}
|
|
aware = (char)(tzinfo != Py_None);
|
|
me = (PyDateTime_DateTime *) (type->tp_alloc(type , aware));
|
|
if (me != NULL) {
|
|
char *pdata = PyString_AS_STRING(state);
|
|
|
|
memcpy(me->data, pdata, _PyDateTime_DATETIME_DATASIZE);
|
|
me->hashcode = -1;
|
|
me->hastzinfo = aware;
|
|
if (aware) {
|
|
Py_INCREF(tzinfo);
|
|
me->tzinfo = tzinfo;
|
|
}
|
|
}
|
|
return (PyObject *)me;
|
|
}
|
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kw, "iii|iiiiO", datetime_kws,
|
|
&year, &month, &day, &hour, &minute,
|
|
&second, &usecond, &tzinfo)) {
|
|
if (check_date_args(year, month, day) < 0)
|
|
return NULL;
|
|
if (check_time_args(hour, minute, second, usecond) < 0)
|
|
return NULL;
|
|
if (check_tzinfo_subclass(tzinfo) < 0)
|
|
return NULL;
|
|
self = new_datetime_ex(year, month, day,
|
|
hour, minute, second, usecond,
|
|
tzinfo, type);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
/* TM_FUNC is the shared type of localtime() and gmtime(). */
|
|
typedef struct tm *(*TM_FUNC)(const time_t *timer);
|
|
|
|
/* Internal helper.
|
|
* Build datetime from a time_t and a distinct count of microseconds.
|
|
* Pass localtime or gmtime for f, to control the interpretation of timet.
|
|
*/
|
|
static PyObject *
|
|
datetime_from_timet_and_us(PyObject *cls, TM_FUNC f, time_t timet, int us,
|
|
PyObject *tzinfo)
|
|
{
|
|
struct tm *tm;
|
|
PyObject *result = NULL;
|
|
|
|
tm = f(&timet);
|
|
if (tm) {
|
|
/* The platform localtime/gmtime may insert leap seconds,
|
|
* indicated by tm->tm_sec > 59. We don't care about them,
|
|
* except to the extent that passing them on to the datetime
|
|
* constructor would raise ValueError for a reason that
|
|
* made no sense to the user.
|
|
*/
|
|
if (tm->tm_sec > 59)
|
|
tm->tm_sec = 59;
|
|
result = PyObject_CallFunction(cls, "iiiiiiiO",
|
|
tm->tm_year + 1900,
|
|
tm->tm_mon + 1,
|
|
tm->tm_mday,
|
|
tm->tm_hour,
|
|
tm->tm_min,
|
|
tm->tm_sec,
|
|
us,
|
|
tzinfo);
|
|
}
|
|
else
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"timestamp out of range for "
|
|
"platform localtime()/gmtime() function");
|
|
return result;
|
|
}
|
|
|
|
/* Internal helper.
|
|
* Build datetime from a Python timestamp. Pass localtime or gmtime for f,
|
|
* to control the interpretation of the timestamp. Since a double doesn't
|
|
* have enough bits to cover a datetime's full range of precision, it's
|
|
* better to call datetime_from_timet_and_us provided you have a way
|
|
* to get that much precision (e.g., C time() isn't good enough).
|
|
*/
|
|
static PyObject *
|
|
datetime_from_timestamp(PyObject *cls, TM_FUNC f, double timestamp,
|
|
PyObject *tzinfo)
|
|
{
|
|
time_t timet;
|
|
double fraction;
|
|
int us;
|
|
|
|
timet = _PyTime_DoubleToTimet(timestamp);
|
|
if (timet == (time_t)-1 && PyErr_Occurred())
|
|
return NULL;
|
|
fraction = timestamp - (double)timet;
|
|
us = (int)round_to_long(fraction * 1e6);
|
|
if (us < 0) {
|
|
/* Truncation towards zero is not what we wanted
|
|
for negative numbers (Python's mod semantics) */
|
|
timet -= 1;
|
|
us += 1000000;
|
|
}
|
|
/* If timestamp is less than one microsecond smaller than a
|
|
* full second, round up. Otherwise, ValueErrors are raised
|
|
* for some floats. */
|
|
if (us == 1000000) {
|
|
timet += 1;
|
|
us = 0;
|
|
}
|
|
return datetime_from_timet_and_us(cls, f, timet, us, tzinfo);
|
|
}
|
|
|
|
/* Internal helper.
|
|
* Build most accurate possible datetime for current time. Pass localtime or
|
|
* gmtime for f as appropriate.
|
|
*/
|
|
static PyObject *
|
|
datetime_best_possible(PyObject *cls, TM_FUNC f, PyObject *tzinfo)
|
|
{
|
|
#ifdef HAVE_GETTIMEOFDAY
|
|
struct timeval t;
|
|
|
|
#ifdef GETTIMEOFDAY_NO_TZ
|
|
gettimeofday(&t);
|
|
#else
|
|
gettimeofday(&t, (struct timezone *)NULL);
|
|
#endif
|
|
return datetime_from_timet_and_us(cls, f, t.tv_sec, (int)t.tv_usec,
|
|
tzinfo);
|
|
|
|
#else /* ! HAVE_GETTIMEOFDAY */
|
|
/* No flavor of gettimeofday exists on this platform. Python's
|
|
* time.time() does a lot of other platform tricks to get the
|
|
* best time it can on the platform, and we're not going to do
|
|
* better than that (if we could, the better code would belong
|
|
* in time.time()!) We're limited by the precision of a double,
|
|
* though.
|
|
*/
|
|
PyObject *time;
|
|
double dtime;
|
|
|
|
time = time_time();
|
|
if (time == NULL)
|
|
return NULL;
|
|
dtime = PyFloat_AsDouble(time);
|
|
Py_DECREF(time);
|
|
if (dtime == -1.0 && PyErr_Occurred())
|
|
return NULL;
|
|
return datetime_from_timestamp(cls, f, dtime, tzinfo);
|
|
#endif /* ! HAVE_GETTIMEOFDAY */
|
|
}
|
|
|
|
/* Return best possible local time -- this isn't constrained by the
|
|
* precision of a timestamp.
|
|
*/
|
|
static PyObject *
|
|
datetime_now(PyObject *cls, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *self;
|
|
PyObject *tzinfo = Py_None;
|
|
static char *keywords[] = {"tz", NULL};
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kw, "|O:now", keywords,
|
|
&tzinfo))
|
|
return NULL;
|
|
if (check_tzinfo_subclass(tzinfo) < 0)
|
|
return NULL;
|
|
|
|
self = datetime_best_possible(cls,
|
|
tzinfo == Py_None ? localtime : gmtime,
|
|
tzinfo);
|
|
if (self != NULL && tzinfo != Py_None) {
|
|
/* Convert UTC to tzinfo's zone. */
|
|
PyObject *temp = self;
|
|
self = PyObject_CallMethod(tzinfo, "fromutc", "O", self);
|
|
Py_DECREF(temp);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
/* Return best possible UTC time -- this isn't constrained by the
|
|
* precision of a timestamp.
|
|
*/
|
|
static PyObject *
|
|
datetime_utcnow(PyObject *cls, PyObject *dummy)
|
|
{
|
|
return datetime_best_possible(cls, gmtime, Py_None);
|
|
}
|
|
|
|
/* Return new local datetime from timestamp (Python timestamp -- a double). */
|
|
static PyObject *
|
|
datetime_fromtimestamp(PyObject *cls, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *self;
|
|
double timestamp;
|
|
PyObject *tzinfo = Py_None;
|
|
static char *keywords[] = {"timestamp", "tz", NULL};
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kw, "d|O:fromtimestamp",
|
|
keywords, ×tamp, &tzinfo))
|
|
return NULL;
|
|
if (check_tzinfo_subclass(tzinfo) < 0)
|
|
return NULL;
|
|
|
|
self = datetime_from_timestamp(cls,
|
|
tzinfo == Py_None ? localtime : gmtime,
|
|
timestamp,
|
|
tzinfo);
|
|
if (self != NULL && tzinfo != Py_None) {
|
|
/* Convert UTC to tzinfo's zone. */
|
|
PyObject *temp = self;
|
|
self = PyObject_CallMethod(tzinfo, "fromutc", "O", self);
|
|
Py_DECREF(temp);
|
|
}
|
|
return self;
|
|
}
|
|
|
|
/* Return new UTC datetime from timestamp (Python timestamp -- a double). */
|
|
static PyObject *
|
|
datetime_utcfromtimestamp(PyObject *cls, PyObject *args)
|
|
{
|
|
double timestamp;
|
|
PyObject *result = NULL;
|
|
|
|
if (PyArg_ParseTuple(args, "d:utcfromtimestamp", ×tamp))
|
|
result = datetime_from_timestamp(cls, gmtime, timestamp,
|
|
Py_None);
|
|
return result;
|
|
}
|
|
|
|
/* Return new datetime from time.strptime(). */
|
|
static PyObject *
|
|
datetime_strptime(PyObject *cls, PyObject *args)
|
|
{
|
|
PyObject *result = NULL, *obj, *module;
|
|
const char *string, *format;
|
|
|
|
if (!PyArg_ParseTuple(args, "ss:strptime", &string, &format))
|
|
return NULL;
|
|
|
|
if ((module = PyImport_ImportModule("time")) == NULL)
|
|
return NULL;
|
|
obj = PyObject_CallMethod(module, "strptime", "ss", string, format);
|
|
Py_DECREF(module);
|
|
|
|
if (obj != NULL) {
|
|
int i, good_timetuple = 1;
|
|
long int ia[6];
|
|
if (PySequence_Check(obj) && PySequence_Size(obj) >= 6)
|
|
for (i=0; i < 6; i++) {
|
|
PyObject *p = PySequence_GetItem(obj, i);
|
|
if (p == NULL) {
|
|
Py_DECREF(obj);
|
|
return NULL;
|
|
}
|
|
if (PyInt_CheckExact(p))
|
|
ia[i] = PyInt_AsLong(p);
|
|
else
|
|
good_timetuple = 0;
|
|
Py_DECREF(p);
|
|
}
|
|
else
|
|
good_timetuple = 0;
|
|
if (good_timetuple)
|
|
result = PyObject_CallFunction(cls, "iiiiii",
|
|
ia[0], ia[1], ia[2], ia[3], ia[4], ia[5]);
|
|
else
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"unexpected value from time.strptime");
|
|
Py_DECREF(obj);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/* Return new datetime from date/datetime and time arguments. */
|
|
static PyObject *
|
|
datetime_combine(PyObject *cls, PyObject *args, PyObject *kw)
|
|
{
|
|
static char *keywords[] = {"date", "time", NULL};
|
|
PyObject *date;
|
|
PyObject *time;
|
|
PyObject *result = NULL;
|
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kw, "O!O!:combine", keywords,
|
|
&PyDateTime_DateType, &date,
|
|
&PyDateTime_TimeType, &time)) {
|
|
PyObject *tzinfo = Py_None;
|
|
|
|
if (HASTZINFO(time))
|
|
tzinfo = ((PyDateTime_Time *)time)->tzinfo;
|
|
result = PyObject_CallFunction(cls, "iiiiiiiO",
|
|
GET_YEAR(date),
|
|
GET_MONTH(date),
|
|
GET_DAY(date),
|
|
TIME_GET_HOUR(time),
|
|
TIME_GET_MINUTE(time),
|
|
TIME_GET_SECOND(time),
|
|
TIME_GET_MICROSECOND(time),
|
|
tzinfo);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/*
|
|
* Destructor.
|
|
*/
|
|
|
|
static void
|
|
datetime_dealloc(PyDateTime_DateTime *self)
|
|
{
|
|
if (HASTZINFO(self)) {
|
|
Py_XDECREF(self->tzinfo);
|
|
}
|
|
self->ob_type->tp_free((PyObject *)self);
|
|
}
|
|
|
|
/*
|
|
* Indirect access to tzinfo methods.
|
|
*/
|
|
|
|
/* These are all METH_NOARGS, so don't need to check the arglist. */
|
|
static PyObject *
|
|
datetime_utcoffset(PyDateTime_DateTime *self, PyObject *unused) {
|
|
return offset_as_timedelta(HASTZINFO(self) ? self->tzinfo : Py_None,
|
|
"utcoffset", (PyObject *)self);
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_dst(PyDateTime_DateTime *self, PyObject *unused) {
|
|
return offset_as_timedelta(HASTZINFO(self) ? self->tzinfo : Py_None,
|
|
"dst", (PyObject *)self);
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_tzname(PyDateTime_DateTime *self, PyObject *unused) {
|
|
return call_tzname(HASTZINFO(self) ? self->tzinfo : Py_None,
|
|
(PyObject *)self);
|
|
}
|
|
|
|
/*
|
|
* datetime arithmetic.
|
|
*/
|
|
|
|
/* factor must be 1 (to add) or -1 (to subtract). The result inherits
|
|
* the tzinfo state of date.
|
|
*/
|
|
static PyObject *
|
|
add_datetime_timedelta(PyDateTime_DateTime *date, PyDateTime_Delta *delta,
|
|
int factor)
|
|
{
|
|
/* Note that the C-level additions can't overflow, because of
|
|
* invariant bounds on the member values.
|
|
*/
|
|
int year = GET_YEAR(date);
|
|
int month = GET_MONTH(date);
|
|
int day = GET_DAY(date) + GET_TD_DAYS(delta) * factor;
|
|
int hour = DATE_GET_HOUR(date);
|
|
int minute = DATE_GET_MINUTE(date);
|
|
int second = DATE_GET_SECOND(date) + GET_TD_SECONDS(delta) * factor;
|
|
int microsecond = DATE_GET_MICROSECOND(date) +
|
|
GET_TD_MICROSECONDS(delta) * factor;
|
|
|
|
assert(factor == 1 || factor == -1);
|
|
if (normalize_datetime(&year, &month, &day,
|
|
&hour, &minute, &second, µsecond) < 0)
|
|
return NULL;
|
|
else
|
|
return new_datetime(year, month, day,
|
|
hour, minute, second, microsecond,
|
|
HASTZINFO(date) ? date->tzinfo : Py_None);
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_add(PyObject *left, PyObject *right)
|
|
{
|
|
if (PyDateTime_Check(left)) {
|
|
/* datetime + ??? */
|
|
if (PyDelta_Check(right))
|
|
/* datetime + delta */
|
|
return add_datetime_timedelta(
|
|
(PyDateTime_DateTime *)left,
|
|
(PyDateTime_Delta *)right,
|
|
1);
|
|
}
|
|
else if (PyDelta_Check(left)) {
|
|
/* delta + datetime */
|
|
return add_datetime_timedelta((PyDateTime_DateTime *) right,
|
|
(PyDateTime_Delta *) left,
|
|
1);
|
|
}
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_subtract(PyObject *left, PyObject *right)
|
|
{
|
|
PyObject *result = Py_NotImplemented;
|
|
|
|
if (PyDateTime_Check(left)) {
|
|
/* datetime - ??? */
|
|
if (PyDateTime_Check(right)) {
|
|
/* datetime - datetime */
|
|
naivety n1, n2;
|
|
int offset1, offset2;
|
|
int delta_d, delta_s, delta_us;
|
|
|
|
if (classify_two_utcoffsets(left, &offset1, &n1, left,
|
|
right, &offset2, &n2,
|
|
right) < 0)
|
|
return NULL;
|
|
assert(n1 != OFFSET_UNKNOWN && n2 != OFFSET_UNKNOWN);
|
|
if (n1 != n2) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"can't subtract offset-naive and "
|
|
"offset-aware datetimes");
|
|
return NULL;
|
|
}
|
|
delta_d = ymd_to_ord(GET_YEAR(left),
|
|
GET_MONTH(left),
|
|
GET_DAY(left)) -
|
|
ymd_to_ord(GET_YEAR(right),
|
|
GET_MONTH(right),
|
|
GET_DAY(right));
|
|
/* These can't overflow, since the values are
|
|
* normalized. At most this gives the number of
|
|
* seconds in one day.
|
|
*/
|
|
delta_s = (DATE_GET_HOUR(left) -
|
|
DATE_GET_HOUR(right)) * 3600 +
|
|
(DATE_GET_MINUTE(left) -
|
|
DATE_GET_MINUTE(right)) * 60 +
|
|
(DATE_GET_SECOND(left) -
|
|
DATE_GET_SECOND(right));
|
|
delta_us = DATE_GET_MICROSECOND(left) -
|
|
DATE_GET_MICROSECOND(right);
|
|
/* (left - offset1) - (right - offset2) =
|
|
* (left - right) + (offset2 - offset1)
|
|
*/
|
|
delta_s += (offset2 - offset1) * 60;
|
|
result = new_delta(delta_d, delta_s, delta_us, 1);
|
|
}
|
|
else if (PyDelta_Check(right)) {
|
|
/* datetime - delta */
|
|
result = add_datetime_timedelta(
|
|
(PyDateTime_DateTime *)left,
|
|
(PyDateTime_Delta *)right,
|
|
-1);
|
|
}
|
|
}
|
|
|
|
if (result == Py_NotImplemented)
|
|
Py_INCREF(result);
|
|
return result;
|
|
}
|
|
|
|
/* Various ways to turn a datetime into a string. */
|
|
|
|
static PyObject *
|
|
datetime_repr(PyDateTime_DateTime *self)
|
|
{
|
|
char buffer[1000];
|
|
const char *type_name = self->ob_type->tp_name;
|
|
PyObject *baserepr;
|
|
|
|
if (DATE_GET_MICROSECOND(self)) {
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
|
"%s(%d, %d, %d, %d, %d, %d, %d)",
|
|
type_name,
|
|
GET_YEAR(self), GET_MONTH(self), GET_DAY(self),
|
|
DATE_GET_HOUR(self), DATE_GET_MINUTE(self),
|
|
DATE_GET_SECOND(self),
|
|
DATE_GET_MICROSECOND(self));
|
|
}
|
|
else if (DATE_GET_SECOND(self)) {
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
|
"%s(%d, %d, %d, %d, %d, %d)",
|
|
type_name,
|
|
GET_YEAR(self), GET_MONTH(self), GET_DAY(self),
|
|
DATE_GET_HOUR(self), DATE_GET_MINUTE(self),
|
|
DATE_GET_SECOND(self));
|
|
}
|
|
else {
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
|
"%s(%d, %d, %d, %d, %d)",
|
|
type_name,
|
|
GET_YEAR(self), GET_MONTH(self), GET_DAY(self),
|
|
DATE_GET_HOUR(self), DATE_GET_MINUTE(self));
|
|
}
|
|
baserepr = PyString_FromString(buffer);
|
|
if (baserepr == NULL || ! HASTZINFO(self))
|
|
return baserepr;
|
|
return append_keyword_tzinfo(baserepr, self->tzinfo);
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_str(PyDateTime_DateTime *self)
|
|
{
|
|
return PyObject_CallMethod((PyObject *)self, "isoformat", "(s)", " ");
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_isoformat(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
|
|
{
|
|
char sep = 'T';
|
|
static char *keywords[] = {"sep", NULL};
|
|
char buffer[100];
|
|
char *cp;
|
|
PyObject *result;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kw, "|c:isoformat", keywords,
|
|
&sep))
|
|
return NULL;
|
|
cp = isoformat_date((PyDateTime_Date *)self, buffer, sizeof(buffer));
|
|
assert(cp != NULL);
|
|
*cp++ = sep;
|
|
isoformat_time(self, cp, sizeof(buffer) - (cp - buffer));
|
|
result = PyString_FromString(buffer);
|
|
if (result == NULL || ! HASTZINFO(self))
|
|
return result;
|
|
|
|
/* We need to append the UTC offset. */
|
|
if (format_utcoffset(buffer, sizeof(buffer), ":", self->tzinfo,
|
|
(PyObject *)self) < 0) {
|
|
Py_DECREF(result);
|
|
return NULL;
|
|
}
|
|
PyString_ConcatAndDel(&result, PyString_FromString(buffer));
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_ctime(PyDateTime_DateTime *self)
|
|
{
|
|
return format_ctime((PyDateTime_Date *)self,
|
|
DATE_GET_HOUR(self),
|
|
DATE_GET_MINUTE(self),
|
|
DATE_GET_SECOND(self));
|
|
}
|
|
|
|
/* Miscellaneous methods. */
|
|
|
|
static PyObject *
|
|
datetime_richcompare(PyObject *self, PyObject *other, int op)
|
|
{
|
|
int diff;
|
|
naivety n1, n2;
|
|
int offset1, offset2;
|
|
|
|
if (! PyDateTime_Check(other)) {
|
|
if (PyDate_Check(other)) {
|
|
/* Prevent invocation of date_richcompare. We want to
|
|
return NotImplemented here to give the other object
|
|
a chance. But since DateTime is a subclass of
|
|
Date, if the other object is a Date, it would
|
|
compute an ordering based on the date part alone,
|
|
and we don't want that. So force unequal or
|
|
uncomparable here in that case. */
|
|
if (op == Py_EQ)
|
|
Py_RETURN_FALSE;
|
|
if (op == Py_NE)
|
|
Py_RETURN_TRUE;
|
|
return cmperror(self, other);
|
|
}
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
if (classify_two_utcoffsets(self, &offset1, &n1, self,
|
|
other, &offset2, &n2, other) < 0)
|
|
return NULL;
|
|
assert(n1 != OFFSET_UNKNOWN && n2 != OFFSET_UNKNOWN);
|
|
/* If they're both naive, or both aware and have the same offsets,
|
|
* we get off cheap. Note that if they're both naive, offset1 ==
|
|
* offset2 == 0 at this point.
|
|
*/
|
|
if (n1 == n2 && offset1 == offset2) {
|
|
diff = memcmp(((PyDateTime_DateTime *)self)->data,
|
|
((PyDateTime_DateTime *)other)->data,
|
|
_PyDateTime_DATETIME_DATASIZE);
|
|
return diff_to_bool(diff, op);
|
|
}
|
|
|
|
if (n1 == OFFSET_AWARE && n2 == OFFSET_AWARE) {
|
|
PyDateTime_Delta *delta;
|
|
|
|
assert(offset1 != offset2); /* else last "if" handled it */
|
|
delta = (PyDateTime_Delta *)datetime_subtract((PyObject *)self,
|
|
other);
|
|
if (delta == NULL)
|
|
return NULL;
|
|
diff = GET_TD_DAYS(delta);
|
|
if (diff == 0)
|
|
diff = GET_TD_SECONDS(delta) |
|
|
GET_TD_MICROSECONDS(delta);
|
|
Py_DECREF(delta);
|
|
return diff_to_bool(diff, op);
|
|
}
|
|
|
|
assert(n1 != n2);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"can't compare offset-naive and "
|
|
"offset-aware datetimes");
|
|
return NULL;
|
|
}
|
|
|
|
static long
|
|
datetime_hash(PyDateTime_DateTime *self)
|
|
{
|
|
if (self->hashcode == -1) {
|
|
naivety n;
|
|
int offset;
|
|
PyObject *temp;
|
|
|
|
n = classify_utcoffset((PyObject *)self, (PyObject *)self,
|
|
&offset);
|
|
assert(n != OFFSET_UNKNOWN);
|
|
if (n == OFFSET_ERROR)
|
|
return -1;
|
|
|
|
/* Reduce this to a hash of another object. */
|
|
if (n == OFFSET_NAIVE)
|
|
temp = PyString_FromStringAndSize(
|
|
(char *)self->data,
|
|
_PyDateTime_DATETIME_DATASIZE);
|
|
else {
|
|
int days;
|
|
int seconds;
|
|
|
|
assert(n == OFFSET_AWARE);
|
|
assert(HASTZINFO(self));
|
|
days = ymd_to_ord(GET_YEAR(self),
|
|
GET_MONTH(self),
|
|
GET_DAY(self));
|
|
seconds = DATE_GET_HOUR(self) * 3600 +
|
|
(DATE_GET_MINUTE(self) - offset) * 60 +
|
|
DATE_GET_SECOND(self);
|
|
temp = new_delta(days,
|
|
seconds,
|
|
DATE_GET_MICROSECOND(self),
|
|
1);
|
|
}
|
|
if (temp != NULL) {
|
|
self->hashcode = PyObject_Hash(temp);
|
|
Py_DECREF(temp);
|
|
}
|
|
}
|
|
return self->hashcode;
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_replace(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
|
|
{
|
|
PyObject *clone;
|
|
PyObject *tuple;
|
|
int y = GET_YEAR(self);
|
|
int m = GET_MONTH(self);
|
|
int d = GET_DAY(self);
|
|
int hh = DATE_GET_HOUR(self);
|
|
int mm = DATE_GET_MINUTE(self);
|
|
int ss = DATE_GET_SECOND(self);
|
|
int us = DATE_GET_MICROSECOND(self);
|
|
PyObject *tzinfo = HASTZINFO(self) ? self->tzinfo : Py_None;
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kw, "|iiiiiiiO:replace",
|
|
datetime_kws,
|
|
&y, &m, &d, &hh, &mm, &ss, &us,
|
|
&tzinfo))
|
|
return NULL;
|
|
tuple = Py_BuildValue("iiiiiiiO", y, m, d, hh, mm, ss, us, tzinfo);
|
|
if (tuple == NULL)
|
|
return NULL;
|
|
clone = datetime_new(self->ob_type, tuple, NULL);
|
|
Py_DECREF(tuple);
|
|
return clone;
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
|
|
{
|
|
int y, m, d, hh, mm, ss, us;
|
|
PyObject *result;
|
|
int offset, none;
|
|
|
|
PyObject *tzinfo;
|
|
static char *keywords[] = {"tz", NULL};
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kw, "O!:astimezone", keywords,
|
|
&PyDateTime_TZInfoType, &tzinfo))
|
|
return NULL;
|
|
|
|
if (!HASTZINFO(self) || self->tzinfo == Py_None)
|
|
goto NeedAware;
|
|
|
|
/* Conversion to self's own time zone is a NOP. */
|
|
if (self->tzinfo == tzinfo) {
|
|
Py_INCREF(self);
|
|
return (PyObject *)self;
|
|
}
|
|
|
|
/* Convert self to UTC. */
|
|
offset = call_utcoffset(self->tzinfo, (PyObject *)self, &none);
|
|
if (offset == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
if (none)
|
|
goto NeedAware;
|
|
|
|
y = GET_YEAR(self);
|
|
m = GET_MONTH(self);
|
|
d = GET_DAY(self);
|
|
hh = DATE_GET_HOUR(self);
|
|
mm = DATE_GET_MINUTE(self);
|
|
ss = DATE_GET_SECOND(self);
|
|
us = DATE_GET_MICROSECOND(self);
|
|
|
|
mm -= offset;
|
|
if ((mm < 0 || mm >= 60) &&
|
|
normalize_datetime(&y, &m, &d, &hh, &mm, &ss, &us) < 0)
|
|
return NULL;
|
|
|
|
/* Attach new tzinfo and let fromutc() do the rest. */
|
|
result = new_datetime(y, m, d, hh, mm, ss, us, tzinfo);
|
|
if (result != NULL) {
|
|
PyObject *temp = result;
|
|
|
|
result = PyObject_CallMethod(tzinfo, "fromutc", "O", temp);
|
|
Py_DECREF(temp);
|
|
}
|
|
return result;
|
|
|
|
NeedAware:
|
|
PyErr_SetString(PyExc_ValueError, "astimezone() cannot be applied to "
|
|
"a naive datetime");
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_timetuple(PyDateTime_DateTime *self)
|
|
{
|
|
int dstflag = -1;
|
|
|
|
if (HASTZINFO(self) && self->tzinfo != Py_None) {
|
|
int none;
|
|
|
|
dstflag = call_dst(self->tzinfo, (PyObject *)self, &none);
|
|
if (dstflag == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
|
|
if (none)
|
|
dstflag = -1;
|
|
else if (dstflag != 0)
|
|
dstflag = 1;
|
|
|
|
}
|
|
return build_struct_time(GET_YEAR(self),
|
|
GET_MONTH(self),
|
|
GET_DAY(self),
|
|
DATE_GET_HOUR(self),
|
|
DATE_GET_MINUTE(self),
|
|
DATE_GET_SECOND(self),
|
|
dstflag);
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_getdate(PyDateTime_DateTime *self)
|
|
{
|
|
return new_date(GET_YEAR(self),
|
|
GET_MONTH(self),
|
|
GET_DAY(self));
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_gettime(PyDateTime_DateTime *self)
|
|
{
|
|
return new_time(DATE_GET_HOUR(self),
|
|
DATE_GET_MINUTE(self),
|
|
DATE_GET_SECOND(self),
|
|
DATE_GET_MICROSECOND(self),
|
|
Py_None);
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_gettimetz(PyDateTime_DateTime *self)
|
|
{
|
|
return new_time(DATE_GET_HOUR(self),
|
|
DATE_GET_MINUTE(self),
|
|
DATE_GET_SECOND(self),
|
|
DATE_GET_MICROSECOND(self),
|
|
HASTZINFO(self) ? self->tzinfo : Py_None);
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_utctimetuple(PyDateTime_DateTime *self)
|
|
{
|
|
int y = GET_YEAR(self);
|
|
int m = GET_MONTH(self);
|
|
int d = GET_DAY(self);
|
|
int hh = DATE_GET_HOUR(self);
|
|
int mm = DATE_GET_MINUTE(self);
|
|
int ss = DATE_GET_SECOND(self);
|
|
int us = 0; /* microseconds are ignored in a timetuple */
|
|
int offset = 0;
|
|
|
|
if (HASTZINFO(self) && self->tzinfo != Py_None) {
|
|
int none;
|
|
|
|
offset = call_utcoffset(self->tzinfo, (PyObject *)self, &none);
|
|
if (offset == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
}
|
|
/* Even if offset is 0, don't call timetuple() -- tm_isdst should be
|
|
* 0 in a UTC timetuple regardless of what dst() says.
|
|
*/
|
|
if (offset) {
|
|
/* Subtract offset minutes & normalize. */
|
|
int stat;
|
|
|
|
mm -= offset;
|
|
stat = normalize_datetime(&y, &m, &d, &hh, &mm, &ss, &us);
|
|
if (stat < 0) {
|
|
/* At the edges, it's possible we overflowed
|
|
* beyond MINYEAR or MAXYEAR.
|
|
*/
|
|
if (PyErr_ExceptionMatches(PyExc_OverflowError))
|
|
PyErr_Clear();
|
|
else
|
|
return NULL;
|
|
}
|
|
}
|
|
return build_struct_time(y, m, d, hh, mm, ss, 0);
|
|
}
|
|
|
|
/* Pickle support, a simple use of __reduce__. */
|
|
|
|
/* Let basestate be the non-tzinfo data string.
|
|
* If tzinfo is None, this returns (basestate,), else (basestate, tzinfo).
|
|
* So it's a tuple in any (non-error) case.
|
|
* __getstate__ isn't exposed.
|
|
*/
|
|
static PyObject *
|
|
datetime_getstate(PyDateTime_DateTime *self)
|
|
{
|
|
PyObject *basestate;
|
|
PyObject *result = NULL;
|
|
|
|
basestate = PyString_FromStringAndSize((char *)self->data,
|
|
_PyDateTime_DATETIME_DATASIZE);
|
|
if (basestate != NULL) {
|
|
if (! HASTZINFO(self) || self->tzinfo == Py_None)
|
|
result = PyTuple_Pack(1, basestate);
|
|
else
|
|
result = PyTuple_Pack(2, basestate, self->tzinfo);
|
|
Py_DECREF(basestate);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
datetime_reduce(PyDateTime_DateTime *self, PyObject *arg)
|
|
{
|
|
return Py_BuildValue("(ON)", self->ob_type, datetime_getstate(self));
|
|
}
|
|
|
|
static PyMethodDef datetime_methods[] = {
|
|
|
|
/* Class methods: */
|
|
|
|
{"now", (PyCFunction)datetime_now,
|
|
METH_KEYWORDS | METH_CLASS,
|
|
PyDoc_STR("[tz] -> new datetime with tz's local day and time.")},
|
|
|
|
{"utcnow", (PyCFunction)datetime_utcnow,
|
|
METH_NOARGS | METH_CLASS,
|
|
PyDoc_STR("Return a new datetime representing UTC day and time.")},
|
|
|
|
{"fromtimestamp", (PyCFunction)datetime_fromtimestamp,
|
|
METH_KEYWORDS | METH_CLASS,
|
|
PyDoc_STR("timestamp[, tz] -> tz's local time from POSIX timestamp.")},
|
|
|
|
{"utcfromtimestamp", (PyCFunction)datetime_utcfromtimestamp,
|
|
METH_VARARGS | METH_CLASS,
|
|
PyDoc_STR("timestamp -> UTC datetime from a POSIX timestamp "
|
|
"(like time.time()).")},
|
|
|
|
{"strptime", (PyCFunction)datetime_strptime,
|
|
METH_VARARGS | METH_CLASS,
|
|
PyDoc_STR("string, format -> new datetime parsed from a string "
|
|
"(like time.strptime()).")},
|
|
|
|
{"combine", (PyCFunction)datetime_combine,
|
|
METH_VARARGS | METH_KEYWORDS | METH_CLASS,
|
|
PyDoc_STR("date, time -> datetime with same date and time fields")},
|
|
|
|
/* Instance methods: */
|
|
|
|
{"date", (PyCFunction)datetime_getdate, METH_NOARGS,
|
|
PyDoc_STR("Return date object with same year, month and day.")},
|
|
|
|
{"time", (PyCFunction)datetime_gettime, METH_NOARGS,
|
|
PyDoc_STR("Return time object with same time but with tzinfo=None.")},
|
|
|
|
{"timetz", (PyCFunction)datetime_gettimetz, METH_NOARGS,
|
|
PyDoc_STR("Return time object with same time and tzinfo.")},
|
|
|
|
{"ctime", (PyCFunction)datetime_ctime, METH_NOARGS,
|
|
PyDoc_STR("Return ctime() style string.")},
|
|
|
|
{"timetuple", (PyCFunction)datetime_timetuple, METH_NOARGS,
|
|
PyDoc_STR("Return time tuple, compatible with time.localtime().")},
|
|
|
|
{"utctimetuple", (PyCFunction)datetime_utctimetuple, METH_NOARGS,
|
|
PyDoc_STR("Return UTC time tuple, compatible with time.localtime().")},
|
|
|
|
{"isoformat", (PyCFunction)datetime_isoformat, METH_KEYWORDS,
|
|
PyDoc_STR("[sep] -> string in ISO 8601 format, "
|
|
"YYYY-MM-DDTHH:MM:SS[.mmmmmm][+HH:MM].\n\n"
|
|
"sep is used to separate the year from the time, and "
|
|
"defaults to 'T'.")},
|
|
|
|
{"utcoffset", (PyCFunction)datetime_utcoffset, METH_NOARGS,
|
|
PyDoc_STR("Return self.tzinfo.utcoffset(self).")},
|
|
|
|
{"tzname", (PyCFunction)datetime_tzname, METH_NOARGS,
|
|
PyDoc_STR("Return self.tzinfo.tzname(self).")},
|
|
|
|
{"dst", (PyCFunction)datetime_dst, METH_NOARGS,
|
|
PyDoc_STR("Return self.tzinfo.dst(self).")},
|
|
|
|
{"replace", (PyCFunction)datetime_replace, METH_KEYWORDS,
|
|
PyDoc_STR("Return datetime with new specified fields.")},
|
|
|
|
{"astimezone", (PyCFunction)datetime_astimezone, METH_KEYWORDS,
|
|
PyDoc_STR("tz -> convert to local time in new timezone tz\n")},
|
|
|
|
{"__reduce__", (PyCFunction)datetime_reduce, METH_NOARGS,
|
|
PyDoc_STR("__reduce__() -> (cls, state)")},
|
|
|
|
{NULL, NULL}
|
|
};
|
|
|
|
static char datetime_doc[] =
|
|
PyDoc_STR("datetime(year, month, day[, hour[, minute[, second[, microsecond[,tzinfo]]]]])\n\
|
|
\n\
|
|
The year, month and day arguments are required. tzinfo may be None, or an\n\
|
|
instance of a tzinfo subclass. The remaining arguments may be ints or longs.\n");
|
|
|
|
static PyNumberMethods datetime_as_number = {
|
|
datetime_add, /* nb_add */
|
|
datetime_subtract, /* nb_subtract */
|
|
0, /* nb_multiply */
|
|
0, /* nb_remainder */
|
|
0, /* nb_divmod */
|
|
0, /* nb_power */
|
|
0, /* nb_negative */
|
|
0, /* nb_positive */
|
|
0, /* nb_absolute */
|
|
0, /* nb_bool */
|
|
};
|
|
|
|
static PyTypeObject PyDateTime_DateTimeType = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"datetime.datetime", /* tp_name */
|
|
sizeof(PyDateTime_DateTime), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)datetime_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)datetime_repr, /* tp_repr */
|
|
&datetime_as_number, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
(hashfunc)datetime_hash, /* tp_hash */
|
|
0, /* tp_call */
|
|
(reprfunc)datetime_str, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
datetime_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
datetime_richcompare, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
datetime_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
datetime_getset, /* tp_getset */
|
|
&PyDateTime_DateType, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
datetime_alloc, /* tp_alloc */
|
|
datetime_new, /* tp_new */
|
|
0, /* tp_free */
|
|
};
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
* Module methods and initialization.
|
|
*/
|
|
|
|
static PyMethodDef module_methods[] = {
|
|
{NULL, NULL}
|
|
};
|
|
|
|
/* C API. Clients get at this via PyDateTime_IMPORT, defined in
|
|
* datetime.h.
|
|
*/
|
|
static PyDateTime_CAPI CAPI = {
|
|
&PyDateTime_DateType,
|
|
&PyDateTime_DateTimeType,
|
|
&PyDateTime_TimeType,
|
|
&PyDateTime_DeltaType,
|
|
&PyDateTime_TZInfoType,
|
|
new_date_ex,
|
|
new_datetime_ex,
|
|
new_time_ex,
|
|
new_delta_ex,
|
|
datetime_fromtimestamp,
|
|
date_fromtimestamp
|
|
};
|
|
|
|
|
|
PyMODINIT_FUNC
|
|
initdatetime(void)
|
|
{
|
|
PyObject *m; /* a module object */
|
|
PyObject *d; /* its dict */
|
|
PyObject *x;
|
|
|
|
m = Py_InitModule3("datetime", module_methods,
|
|
"Fast implementation of the datetime type.");
|
|
if (m == NULL)
|
|
return;
|
|
|
|
if (PyType_Ready(&PyDateTime_DateType) < 0)
|
|
return;
|
|
if (PyType_Ready(&PyDateTime_DateTimeType) < 0)
|
|
return;
|
|
if (PyType_Ready(&PyDateTime_DeltaType) < 0)
|
|
return;
|
|
if (PyType_Ready(&PyDateTime_TimeType) < 0)
|
|
return;
|
|
if (PyType_Ready(&PyDateTime_TZInfoType) < 0)
|
|
return;
|
|
|
|
/* timedelta values */
|
|
d = PyDateTime_DeltaType.tp_dict;
|
|
|
|
x = new_delta(0, 0, 1, 0);
|
|
if (x == NULL || PyDict_SetItemString(d, "resolution", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
x = new_delta(-MAX_DELTA_DAYS, 0, 0, 0);
|
|
if (x == NULL || PyDict_SetItemString(d, "min", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
x = new_delta(MAX_DELTA_DAYS, 24*3600-1, 1000000-1, 0);
|
|
if (x == NULL || PyDict_SetItemString(d, "max", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
/* date values */
|
|
d = PyDateTime_DateType.tp_dict;
|
|
|
|
x = new_date(1, 1, 1);
|
|
if (x == NULL || PyDict_SetItemString(d, "min", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
x = new_date(MAXYEAR, 12, 31);
|
|
if (x == NULL || PyDict_SetItemString(d, "max", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
x = new_delta(1, 0, 0, 0);
|
|
if (x == NULL || PyDict_SetItemString(d, "resolution", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
/* time values */
|
|
d = PyDateTime_TimeType.tp_dict;
|
|
|
|
x = new_time(0, 0, 0, 0, Py_None);
|
|
if (x == NULL || PyDict_SetItemString(d, "min", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
x = new_time(23, 59, 59, 999999, Py_None);
|
|
if (x == NULL || PyDict_SetItemString(d, "max", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
x = new_delta(0, 0, 1, 0);
|
|
if (x == NULL || PyDict_SetItemString(d, "resolution", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
/* datetime values */
|
|
d = PyDateTime_DateTimeType.tp_dict;
|
|
|
|
x = new_datetime(1, 1, 1, 0, 0, 0, 0, Py_None);
|
|
if (x == NULL || PyDict_SetItemString(d, "min", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
x = new_datetime(MAXYEAR, 12, 31, 23, 59, 59, 999999, Py_None);
|
|
if (x == NULL || PyDict_SetItemString(d, "max", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
x = new_delta(0, 0, 1, 0);
|
|
if (x == NULL || PyDict_SetItemString(d, "resolution", x) < 0)
|
|
return;
|
|
Py_DECREF(x);
|
|
|
|
/* module initialization */
|
|
PyModule_AddIntConstant(m, "MINYEAR", MINYEAR);
|
|
PyModule_AddIntConstant(m, "MAXYEAR", MAXYEAR);
|
|
|
|
Py_INCREF(&PyDateTime_DateType);
|
|
PyModule_AddObject(m, "date", (PyObject *) &PyDateTime_DateType);
|
|
|
|
Py_INCREF(&PyDateTime_DateTimeType);
|
|
PyModule_AddObject(m, "datetime",
|
|
(PyObject *)&PyDateTime_DateTimeType);
|
|
|
|
Py_INCREF(&PyDateTime_TimeType);
|
|
PyModule_AddObject(m, "time", (PyObject *) &PyDateTime_TimeType);
|
|
|
|
Py_INCREF(&PyDateTime_DeltaType);
|
|
PyModule_AddObject(m, "timedelta", (PyObject *) &PyDateTime_DeltaType);
|
|
|
|
Py_INCREF(&PyDateTime_TZInfoType);
|
|
PyModule_AddObject(m, "tzinfo", (PyObject *) &PyDateTime_TZInfoType);
|
|
|
|
x = PyCObject_FromVoidPtrAndDesc(&CAPI, (void*) DATETIME_API_MAGIC,
|
|
NULL);
|
|
if (x == NULL)
|
|
return;
|
|
PyModule_AddObject(m, "datetime_CAPI", x);
|
|
|
|
/* A 4-year cycle has an extra leap day over what we'd get from
|
|
* pasting together 4 single years.
|
|
*/
|
|
assert(DI4Y == 4 * 365 + 1);
|
|
assert(DI4Y == days_before_year(4+1));
|
|
|
|
/* Similarly, a 400-year cycle has an extra leap day over what we'd
|
|
* get from pasting together 4 100-year cycles.
|
|
*/
|
|
assert(DI400Y == 4 * DI100Y + 1);
|
|
assert(DI400Y == days_before_year(400+1));
|
|
|
|
/* OTOH, a 100-year cycle has one fewer leap day than we'd get from
|
|
* pasting together 25 4-year cycles.
|
|
*/
|
|
assert(DI100Y == 25 * DI4Y - 1);
|
|
assert(DI100Y == days_before_year(100+1));
|
|
|
|
us_per_us = PyInt_FromLong(1);
|
|
us_per_ms = PyInt_FromLong(1000);
|
|
us_per_second = PyInt_FromLong(1000000);
|
|
us_per_minute = PyInt_FromLong(60000000);
|
|
seconds_per_day = PyInt_FromLong(24 * 3600);
|
|
if (us_per_us == NULL || us_per_ms == NULL || us_per_second == NULL ||
|
|
us_per_minute == NULL || seconds_per_day == NULL)
|
|
return;
|
|
|
|
/* The rest are too big for 32-bit ints, but even
|
|
* us_per_week fits in 40 bits, so doubles should be exact.
|
|
*/
|
|
us_per_hour = PyLong_FromDouble(3600000000.0);
|
|
us_per_day = PyLong_FromDouble(86400000000.0);
|
|
us_per_week = PyLong_FromDouble(604800000000.0);
|
|
if (us_per_hour == NULL || us_per_day == NULL || us_per_week == NULL)
|
|
return;
|
|
}
|
|
|
|
/* ---------------------------------------------------------------------------
|
|
Some time zone algebra. For a datetime x, let
|
|
x.n = x stripped of its timezone -- its naive time.
|
|
x.o = x.utcoffset(), and assuming that doesn't raise an exception or
|
|
return None
|
|
x.d = x.dst(), and assuming that doesn't raise an exception or
|
|
return None
|
|
x.s = x's standard offset, x.o - x.d
|
|
|
|
Now some derived rules, where k is a duration (timedelta).
|
|
|
|
1. x.o = x.s + x.d
|
|
This follows from the definition of x.s.
|
|
|
|
2. If x and y have the same tzinfo member, x.s = y.s.
|
|
This is actually a requirement, an assumption we need to make about
|
|
sane tzinfo classes.
|
|
|
|
3. The naive UTC time corresponding to x is x.n - x.o.
|
|
This is again a requirement for a sane tzinfo class.
|
|
|
|
4. (x+k).s = x.s
|
|
This follows from #2, and that datimetimetz+timedelta preserves tzinfo.
|
|
|
|
5. (x+k).n = x.n + k
|
|
Again follows from how arithmetic is defined.
|
|
|
|
Now we can explain tz.fromutc(x). Let's assume it's an interesting case
|
|
(meaning that the various tzinfo methods exist, and don't blow up or return
|
|
None when called).
|
|
|
|
The function wants to return a datetime y with timezone tz, equivalent to x.
|
|
x is already in UTC.
|
|
|
|
By #3, we want
|
|
|
|
y.n - y.o = x.n [1]
|
|
|
|
The algorithm starts by attaching tz to x.n, and calling that y. So
|
|
x.n = y.n at the start. Then it wants to add a duration k to y, so that [1]
|
|
becomes true; in effect, we want to solve [2] for k:
|
|
|
|
(y+k).n - (y+k).o = x.n [2]
|
|
|
|
By #1, this is the same as
|
|
|
|
(y+k).n - ((y+k).s + (y+k).d) = x.n [3]
|
|
|
|
By #5, (y+k).n = y.n + k, which equals x.n + k because x.n=y.n at the start.
|
|
Substituting that into [3],
|
|
|
|
x.n + k - (y+k).s - (y+k).d = x.n; the x.n terms cancel, leaving
|
|
k - (y+k).s - (y+k).d = 0; rearranging,
|
|
k = (y+k).s - (y+k).d; by #4, (y+k).s == y.s, so
|
|
k = y.s - (y+k).d
|
|
|
|
On the RHS, (y+k).d can't be computed directly, but y.s can be, and we
|
|
approximate k by ignoring the (y+k).d term at first. Note that k can't be
|
|
very large, since all offset-returning methods return a duration of magnitude
|
|
less than 24 hours. For that reason, if y is firmly in std time, (y+k).d must
|
|
be 0, so ignoring it has no consequence then.
|
|
|
|
In any case, the new value is
|
|
|
|
z = y + y.s [4]
|
|
|
|
It's helpful to step back at look at [4] from a higher level: it's simply
|
|
mapping from UTC to tz's standard time.
|
|
|
|
At this point, if
|
|
|
|
z.n - z.o = x.n [5]
|
|
|
|
we have an equivalent time, and are almost done. The insecurity here is
|
|
at the start of daylight time. Picture US Eastern for concreteness. The wall
|
|
time jumps from 1:59 to 3:00, and wall hours of the form 2:MM don't make good
|
|
sense then. The docs ask that an Eastern tzinfo class consider such a time to
|
|
be EDT (because it's "after 2"), which is a redundant spelling of 1:MM EST
|
|
on the day DST starts. We want to return the 1:MM EST spelling because that's
|
|
the only spelling that makes sense on the local wall clock.
|
|
|
|
In fact, if [5] holds at this point, we do have the standard-time spelling,
|
|
but that takes a bit of proof. We first prove a stronger result. What's the
|
|
difference between the LHS and RHS of [5]? Let
|
|
|
|
diff = x.n - (z.n - z.o) [6]
|
|
|
|
Now
|
|
z.n = by [4]
|
|
(y + y.s).n = by #5
|
|
y.n + y.s = since y.n = x.n
|
|
x.n + y.s = since z and y are have the same tzinfo member,
|
|
y.s = z.s by #2
|
|
x.n + z.s
|
|
|
|
Plugging that back into [6] gives
|
|
|
|
diff =
|
|
x.n - ((x.n + z.s) - z.o) = expanding
|
|
x.n - x.n - z.s + z.o = cancelling
|
|
- z.s + z.o = by #2
|
|
z.d
|
|
|
|
So diff = z.d.
|
|
|
|
If [5] is true now, diff = 0, so z.d = 0 too, and we have the standard-time
|
|
spelling we wanted in the endcase described above. We're done. Contrarily,
|
|
if z.d = 0, then we have a UTC equivalent, and are also done.
|
|
|
|
If [5] is not true now, diff = z.d != 0, and z.d is the offset we need to
|
|
add to z (in effect, z is in tz's standard time, and we need to shift the
|
|
local clock into tz's daylight time).
|
|
|
|
Let
|
|
|
|
z' = z + z.d = z + diff [7]
|
|
|
|
and we can again ask whether
|
|
|
|
z'.n - z'.o = x.n [8]
|
|
|
|
If so, we're done. If not, the tzinfo class is insane, according to the
|
|
assumptions we've made. This also requires a bit of proof. As before, let's
|
|
compute the difference between the LHS and RHS of [8] (and skipping some of
|
|
the justifications for the kinds of substitutions we've done several times
|
|
already):
|
|
|
|
diff' = x.n - (z'.n - z'.o) = replacing z'.n via [7]
|
|
x.n - (z.n + diff - z'.o) = replacing diff via [6]
|
|
x.n - (z.n + x.n - (z.n - z.o) - z'.o) =
|
|
x.n - z.n - x.n + z.n - z.o + z'.o = cancel x.n
|
|
- z.n + z.n - z.o + z'.o = cancel z.n
|
|
- z.o + z'.o = #1 twice
|
|
-z.s - z.d + z'.s + z'.d = z and z' have same tzinfo
|
|
z'.d - z.d
|
|
|
|
So z' is UTC-equivalent to x iff z'.d = z.d at this point. If they are equal,
|
|
we've found the UTC-equivalent so are done. In fact, we stop with [7] and
|
|
return z', not bothering to compute z'.d.
|
|
|
|
How could z.d and z'd differ? z' = z + z.d [7], so merely moving z' by
|
|
a dst() offset, and starting *from* a time already in DST (we know z.d != 0),
|
|
would have to change the result dst() returns: we start in DST, and moving
|
|
a little further into it takes us out of DST.
|
|
|
|
There isn't a sane case where this can happen. The closest it gets is at
|
|
the end of DST, where there's an hour in UTC with no spelling in a hybrid
|
|
tzinfo class. In US Eastern, that's 5:MM UTC = 0:MM EST = 1:MM EDT. During
|
|
that hour, on an Eastern clock 1:MM is taken as being in standard time (6:MM
|
|
UTC) because the docs insist on that, but 0:MM is taken as being in daylight
|
|
time (4:MM UTC). There is no local time mapping to 5:MM UTC. The local
|
|
clock jumps from 1:59 back to 1:00 again, and repeats the 1:MM hour in
|
|
standard time. Since that's what the local clock *does*, we want to map both
|
|
UTC hours 5:MM and 6:MM to 1:MM Eastern. The result is ambiguous
|
|
in local time, but so it goes -- it's the way the local clock works.
|
|
|
|
When x = 5:MM UTC is the input to this algorithm, x.o=0, y.o=-5 and y.d=0,
|
|
so z=0:MM. z.d=60 (minutes) then, so [5] doesn't hold and we keep going.
|
|
z' = z + z.d = 1:MM then, and z'.d=0, and z'.d - z.d = -60 != 0 so [8]
|
|
(correctly) concludes that z' is not UTC-equivalent to x.
|
|
|
|
Because we know z.d said z was in daylight time (else [5] would have held and
|
|
we would have stopped then), and we know z.d != z'.d (else [8] would have held
|
|
and we would have stopped then), and there are only 2 possible values dst() can
|
|
return in Eastern, it follows that z'.d must be 0 (which it is in the example,
|
|
but the reasoning doesn't depend on the example -- it depends on there being
|
|
two possible dst() outcomes, one zero and the other non-zero). Therefore
|
|
z' must be in standard time, and is the spelling we want in this case.
|
|
|
|
Note again that z' is not UTC-equivalent as far as the hybrid tzinfo class is
|
|
concerned (because it takes z' as being in standard time rather than the
|
|
daylight time we intend here), but returning it gives the real-life "local
|
|
clock repeats an hour" behavior when mapping the "unspellable" UTC hour into
|
|
tz.
|
|
|
|
When the input is 6:MM, z=1:MM and z.d=0, and we stop at once, again with
|
|
the 1:MM standard time spelling we want.
|
|
|
|
So how can this break? One of the assumptions must be violated. Two
|
|
possibilities:
|
|
|
|
1) [2] effectively says that y.s is invariant across all y belong to a given
|
|
time zone. This isn't true if, for political reasons or continental drift,
|
|
a region decides to change its base offset from UTC.
|
|
|
|
2) There may be versions of "double daylight" time where the tail end of
|
|
the analysis gives up a step too early. I haven't thought about that
|
|
enough to say.
|
|
|
|
In any case, it's clear that the default fromutc() is strong enough to handle
|
|
"almost all" time zones: so long as the standard offset is invariant, it
|
|
doesn't matter if daylight time transition points change from year to year, or
|
|
if daylight time is skipped in some years; it doesn't matter how large or
|
|
small dst() may get within its bounds; and it doesn't even matter if some
|
|
perverse time zone returns a negative dst()). So a breaking case must be
|
|
pretty bizarre, and a tzinfo subclass can override fromutc() if it is.
|
|
--------------------------------------------------------------------------- */
|