[Python-checkins] peps (merge default -> default): Merge.

[eric.smith]

http://hg.python.org/peps/rev/6edfeda4d49f
changeset:   4347:6edfeda4d49f
parent:      4346:95cc28d462fd
parent:      4345:4f33e5ec6145
user:        Eric V. Smith <eric at trueblade.com>
date:        Wed May 02 11:57:17 2012 -0400
summary:
  Merge.

files:
  pep-0418.txt |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/pep-0418.txt b/pep-0418.txt
--- a/pep-0418.txt
+++ b/pep-0418.txt
@@ -86,7 +86,7 @@
 * time.monotonic() and time.perf_counter() may or may not be adjusted.
   For example, ``CLOCK_MONOTONIC`` is slewed on Linux, whereas
   ``GetTickCount()`` is not adjusted on Windows.
-  ``time.get_clock_info('monotonic')['is_adjusted']`` can be used to check
+  ``time.get_clock_info('monotonic')['adjusted']`` can be used to check
   if the monotonic clock is adjusted or not.
 * No time.thread_time() function is proposed by this PEP because it is
   not needed by Python standard library nor a common asked feature.
@@ -119,8 +119,8 @@
  * ``implementation`` (str): name of the underlying operating system
    function.  Examples: ``"QueryPerformanceCounter()"``,
    ``"clock_gettime(CLOCK_REALTIME)"``.
- * ``is_monotonic`` (bool): True if the clock cannot go backward.
- * ``is_adjusted`` (bool): True if the clock is adjusted (e.g. by a
+ * ``monotonic`` (bool): True if the clock cannot go backward.
+ * ``adjusted`` (bool): True if the clock can be adjusted (e.g. by a
    NTP daemon).
  * ``resolution`` (float): resolution in seconds of the clock.
 

-- 
Repository URL: http://hg.python.org/peps