From 527a5cf1e6ce45960ee9b15c02b07dab9c4d0b41 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 1 Aug 2010 19:21:34 +0000 Subject: [PATCH] Merged revisions 83325,83328,83341 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r83325 | georg.brandl | 2010-07-31 11:37:03 +0200 (Sa, 31 Jul 2010) | 1 line Copy Sun-specific inclusion of from 2.7 maint to trunk; it seems to not have been merged to py3k. ........ r83328 | raymond.hettinger | 2010-07-31 12:14:41 +0200 (Sa, 31 Jul 2010) | 1 line Document how to change OrderedDict update order from first to last. ........ r83341 | georg.brandl | 2010-07-31 13:40:07 +0200 (Sa, 31 Jul 2010) | 1 line #9430: document timedelta str() and repr(). ........ --- Doc/library/datetime.rst | 18 ++++++++++++++++++ Modules/_ctypes/ctypes.h | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index 3789bebcb3..6ead309b3f 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -233,6 +233,14 @@ Supported operations: | ``abs(t)`` | equivalent to +\ *t* when ``t.days >= 0``, and| | | to -*t* when ``t.days < 0``. (2) | +--------------------------------+-----------------------------------------------+ +| ``str(t)`` | Returns a string in the form | +| | ``[D day[s], ][H]H:MM:SS[.UUUUUU]``, where D | +| | is negative for negative ``t``. (5) | ++--------------------------------+-----------------------------------------------+ +| ``repr(t)`` | Returns a string in the form | +| | ``datetime.timedelta(D[, S[, U]])``, where D | +| | is negative for negative ``t``. (5) | ++--------------------------------+-----------------------------------------------+ Notes: @@ -248,6 +256,16 @@ Notes: (4) -*timedelta.max* is not representable as a :class:`timedelta` object. +(5) + String representations of :class:`timedelta` objects are normalized + similarly to their internal representation. This leads to somewhat + unusual results for negative timedeltas. For example: + + >>> timedelta(hours=-5) + datetime.timedelta(-1, 68400) + >>> print(_) + -1 day, 19:00:00 + In addition to the operations listed above :class:`timedelta` objects support certain additions and subtractions with :class:`date` and :class:`datetime` objects (see below). diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h index e0bad07953..0af5fa1ddf 100644 --- a/Modules/_ctypes/ctypes.h +++ b/Modules/_ctypes/ctypes.h @@ -1,3 +1,7 @@ +#if defined (__SVR4) && defined (__sun) +# include +#endif + #ifndef MS_WIN32 #define max(a, b) ((a) > (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b)) -- 2.40.0