[Python-checkins] r59742 - python/trunk/Doc/library/contextlib.rst python/trunk/Doc/library/decimal.rst python/trunk/Doc/library/math.rst python/trunk/Doc/library/numbers.rst python/trunk/Doc/library/thread.rst python/trunk/Doc/library/threading.rst

[georg.brandl]

Author: georg.brandl
Date: Sat Jan  5 20:28:16 2008
New Revision: 59742

Modified:
   python/trunk/Doc/library/contextlib.rst
   python/trunk/Doc/library/decimal.rst
   python/trunk/Doc/library/math.rst
   python/trunk/Doc/library/numbers.rst
   python/trunk/Doc/library/thread.rst
   python/trunk/Doc/library/threading.rst
Log:
Remove with_statement future imports from 2.6 docs.


Modified: python/trunk/Doc/library/contextlib.rst
==============================================================================
--- python/trunk/Doc/library/contextlib.rst	(original)
+++ python/trunk/Doc/library/contextlib.rst	Sat Jan  5 20:28:16 2008
@@ -23,7 +23,6 @@
 
    A simple example (this is not recommended as a real way of generating HTML!)::
 
-      from __future__ import with_statement
       from contextlib import contextmanager
 
       @contextmanager
@@ -100,7 +99,6 @@
 
    And lets you write code like this::
 
-      from __future__ import with_statement
       from contextlib import closing
       import urllib
 

Modified: python/trunk/Doc/library/decimal.rst
==============================================================================
--- python/trunk/Doc/library/decimal.rst	(original)
+++ python/trunk/Doc/library/decimal.rst	Sat Jan  5 20:28:16 2008
@@ -840,7 +840,6 @@
    For example, the following code sets the current decimal precision to 42 places,
    performs a calculation, and then automatically restores the previous context::
 
-      from __future__ import with_statement
       from decimal import localcontext
 
       with localcontext() as ctx:

Modified: python/trunk/Doc/library/math.rst
==============================================================================
--- python/trunk/Doc/library/math.rst	(original)
+++ python/trunk/Doc/library/math.rst	Sat Jan  5 20:28:16 2008
@@ -48,6 +48,9 @@
    Return the floor of *x* as a float, the largest integer value less than or equal
    to *x*.
 
+   .. versionchanged:: 2.6
+      Added :meth:`__floor__` delegation.
+
 
 .. function:: fmod(x, y)
 

Modified: python/trunk/Doc/library/numbers.rst
==============================================================================
--- python/trunk/Doc/library/numbers.rst	(original)
+++ python/trunk/Doc/library/numbers.rst	Sat Jan  5 20:28:16 2008
@@ -1,10 +1,12 @@
-
 :mod:`numbers` --- Numeric abstract base classes
 ================================================
 
 .. module:: numbers
    :synopsis: Numeric abstract base classes (Complex, Real, Integral, etc.).
 
+.. versionadded:: 2.6
+
+
 The :mod:`numbers` module (:pep:`3141`) defines a hierarchy of numeric abstract
 base classes which progressively define more operations. These concepts also
 provide a way to distinguish exact from inexact types. None of the types defined

Modified: python/trunk/Doc/library/thread.rst
==============================================================================
--- python/trunk/Doc/library/thread.rst	(original)
+++ python/trunk/Doc/library/thread.rst	Sat Jan  5 20:28:16 2008
@@ -135,7 +135,6 @@
 In addition to these methods, lock objects can also be used via the
 :keyword:`with` statement, e.g.::
 
-   from __future__ import with_statement
    import thread
 
    a_lock = thread.allocate_lock()

Modified: python/trunk/Doc/library/threading.rst
==============================================================================
--- python/trunk/Doc/library/threading.rst	(original)
+++ python/trunk/Doc/library/threading.rst	Sat Jan  5 20:28:16 2008
@@ -723,7 +723,6 @@
 :class:`Semaphore`, and :class:`BoundedSemaphore` objects may be used as
 :keyword:`with` statement context managers.  For example::
 
-   from __future__ import with_statement
    import threading
 
    some_rlock = threading.RLock()