summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-03-15 07:09:53 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-03-15 07:09:53 (GMT)
commit7cc7033cb428ad74366f93e8ebcb4bb74f3f6511 (patch)
treec001244fcf1be14ca898735055efcb2a2804d31e /Doc
parentd3d7c903e6ee86d54d7fdb720ce81f24ee75e316 (diff)
parent38c27546520fea63bc7efb031f2a6255506d2c5c (diff)
downloadcpython-7cc7033cb428ad74366f93e8ebcb4bb74f3f6511.zip
cpython-7cc7033cb428ad74366f93e8ebcb4bb74f3f6511.tar.gz
cpython-7cc7033cb428ad74366f93e8ebcb4bb74f3f6511.tar.bz2
Merge #12758: removing confusing mention of UTC from time.time description
Patch by Dylan Sarber. (Not sure why hg told me it merged pyexpat.c too, it showed no changes)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/time.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index fcee551..3e666cf 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -452,8 +452,8 @@ The module defines the following functions and data items:
.. function:: time()
- Return the time as a floating point number expressed in seconds since the epoch,
- in UTC. Note that even though the time is always returned as a floating point
+ Return the time in seconds since the epoch as a floating point number.
+ Note that even though the time is always returned as a floating point
number, not all systems provide time with a better precision than 1 second.
While this function normally returns non-decreasing values, it can return a
lower value than a previous call if the system clock has been set back between