summaryrefslogtreecommitdiffstats
path: root/Doc/library/__future__.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-04-28 18:18:53 (GMT)
committerGeorg Brandl <georg@python.org>2009-04-28 18:18:53 (GMT)
commit91e3f770a11f98a2871b20f497d81fbb6b47827e (patch)
tree492ed9b45ae72a8370a3f97438c85fa0bb2c2af0 /Doc/library/__future__.rst
parented4cf72dccde157c504b8d9cafbecdd1ce040114 (diff)
downloadcpython-91e3f770a11f98a2871b20f497d81fbb6b47827e.zip
cpython-91e3f770a11f98a2871b20f497d81fbb6b47827e.tar.gz
cpython-91e3f770a11f98a2871b20f497d81fbb6b47827e.tar.bz2
Merged revisions 71786-71787,71814-71817,71901-71903 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r71786 | georg.brandl | 2009-04-21 20:23:08 +0200 (Di, 21 Apr 2009) | 1 line #5757: fix copy-paste error in notify(). ........ r71787 | georg.brandl | 2009-04-21 20:24:34 +0200 (Di, 21 Apr 2009) | 1 line #5751: fix escaping of \\n. ........ r71814 | georg.brandl | 2009-04-23 10:44:57 +0200 (Do, 23 Apr 2009) | 1 line #5820: fix bug in usage of getreader(). ........ r71815 | georg.brandl | 2009-04-23 10:49:39 +0200 (Do, 23 Apr 2009) | 1 line Fix rewrapping accident. ........ r71816 | georg.brandl | 2009-04-23 10:49:56 +0200 (Do, 23 Apr 2009) | 1 line #5813: add a reference to the "future statements" section. ........ r71817 | georg.brandl | 2009-04-23 10:52:03 +0200 (Do, 23 Apr 2009) | 1 line Add link to PEP 236. ........ r71901 | georg.brandl | 2009-04-25 16:50:25 +0200 (Sa, 25 Apr 2009) | 1 line #3320: fix spelling. ........ r71902 | georg.brandl | 2009-04-25 16:51:31 +0200 (Sa, 25 Apr 2009) | 1 line #5834: use "failure" instead of "error" because the two have different meanings in unittest context. ........ r71903 | georg.brandl | 2009-04-25 17:05:04 +0200 (Sa, 25 Apr 2009) | 1 line #5821: add some capabilities of TarFile's file-like object. ........
Diffstat (limited to 'Doc/library/__future__.rst')
-rw-r--r--Doc/library/__future__.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/Doc/library/__future__.rst b/Doc/library/__future__.rst
index d6f82a3..b09246e 100644
--- a/Doc/library/__future__.rst
+++ b/Doc/library/__future__.rst
@@ -58,3 +58,7 @@ attribute on :class:`_Feature` instances.
No feature description will ever be deleted from :mod:`__future__`.
+.. seealso::
+
+ :ref:`future`
+ How the compiler treats future imports.