summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-01-05 19:28:16 (GMT)
committerGeorg Brandl <georg@python.org>2008-01-05 19:28:16 (GMT)
commit9749e15e2ff9fffd987679cc3914c726af8876b3 (patch)
treeacbbdcd3e421ab18ff2f8766574806d0f5e02d03
parent9fcd8ceb74fec0b596ca266868d28955fa251ff1 (diff)
downloadcpython-9749e15e2ff9fffd987679cc3914c726af8876b3.zip
cpython-9749e15e2ff9fffd987679cc3914c726af8876b3.tar.gz
cpython-9749e15e2ff9fffd987679cc3914c726af8876b3.tar.bz2
Remove with_statement future imports from 2.6 docs.
-rw-r--r--Doc/library/contextlib.rst2
-rw-r--r--Doc/library/decimal.rst1
-rw-r--r--Doc/library/math.rst3
-rw-r--r--Doc/library/numbers.rst4
-rw-r--r--Doc/library/thread.rst1
-rw-r--r--Doc/library/threading.rst1
6 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
index 11af432..8c10c95 100644
--- a/Doc/library/contextlib.rst
+++ b/Doc/library/contextlib.rst
@@ -23,7 +23,6 @@ Functions provided:
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 @@ Functions provided:
And lets you write code like this::
- from __future__ import with_statement
from contextlib import closing
import urllib
diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index 6383673..d8942f8 100644
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -840,7 +840,6 @@ the :func:`localcontext` function to temporarily change the active context.
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:
diff --git a/Doc/library/math.rst b/Doc/library/math.rst
index 6c78104..b111dd1 100644
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -48,6 +48,9 @@ Number-theoretic and representation functions:
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)
diff --git a/Doc/library/numbers.rst b/Doc/library/numbers.rst
index d0f9c3b..505a8af 100644
--- a/Doc/library/numbers.rst
+++ b/Doc/library/numbers.rst
@@ -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
diff --git a/Doc/library/thread.rst b/Doc/library/thread.rst
index afe8cbe..b0e55ea 100644
--- a/Doc/library/thread.rst
+++ b/Doc/library/thread.rst
@@ -135,7 +135,6 @@ Lock objects have the following methods:
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()
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 650a113..d5bd5d1 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -723,7 +723,6 @@ Currently, :class:`Lock`, :class:`RLock`, :class:`Condition`,
: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()