Skip to content

Commit 44ad014

Browse files
committed
Revert accidentally-pushed commit
This reverts commit 55572d4.
1 parent 83072af commit 44ad014

1 file changed

Lines changed: 32 additions & 46 deletions

File tree

Doc/library/__future__.rst

Lines changed: 32 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -37,52 +37,38 @@ No feature description will ever be deleted from :mod:`__future__`. Since its
3737
introduction in Python 2.1 the following features have found their way into the
3838
language using this mechanism:
3939

40-
41-
.. list-table::
42-
:widths: auto
43-
:header-rows: 1
44-
45-
* * feature
46-
* optional in
47-
* mandatory in
48-
* effect
49-
* * nested_scopes
50-
* 2.1.0b1
51-
* 2.2
52-
* :pep:`227`: *Statically Nested Scopes*
53-
* * generators
54-
* 2.2.0a1
55-
* 2.3
56-
* :pep:`255`: *Simple Generators*
57-
* * division
58-
* 2.2.0a2
59-
* 3.0
60-
* :pep:`238`: *Changing the Division Operator*
61-
* * absolute_import
62-
* 2.5.0a1
63-
* 3.0
64-
* :pep:`328`: *Imports: Multi-Line and Absolute/Relative*
65-
* * with_statement
66-
* 2.5.0a1
67-
* 2.6
68-
* :pep:`343`: *The “with” Statement*
69-
* * print_function
70-
* 2.6.0a2
71-
* 3.0
72-
* :pep:`3105`: *Make print a function*
73-
* * unicode_literals
74-
* 2.6.0a2
75-
* 3.0
76-
* :pep:`3112`: *Bytes literals in Python 3000*
77-
* * generator_stop
78-
* 3.5.0b1
79-
* 3.7
80-
* :pep:`479`: *StopIteration handling inside generators*
81-
* * annotations
82-
* 3.7.0b1
83-
* Never [1]_
84-
* :pep:`563`: *Postponed evaluation of annotations*,
85-
:pep:`649`: *Deferred evaluation of annotations using descriptors*
40+
+------------------+-------------+--------------+---------------------------------------------+
41+
| feature | optional in | mandatory in | effect |
42+
+==================+=============+==============+=============================================+
43+
| nested_scopes | 2.1.0b1 | 2.2 | :pep:`227`: |
44+
| | | | *Statically Nested Scopes* |
45+
+------------------+-------------+--------------+---------------------------------------------+
46+
| generators | 2.2.0a1 | 2.3 | :pep:`255`: |
47+
| | | | *Simple Generators* |
48+
+------------------+-------------+--------------+---------------------------------------------+
49+
| division | 2.2.0a2 | 3.0 | :pep:`238`: |
50+
| | | | *Changing the Division Operator* |
51+
+------------------+-------------+--------------+---------------------------------------------+
52+
| absolute_import | 2.5.0a1 | 3.0 | :pep:`328`: |
53+
| | | | *Imports: Multi-Line and Absolute/Relative* |
54+
+------------------+-------------+--------------+---------------------------------------------+
55+
| with_statement | 2.5.0a1 | 2.6 | :pep:`343`: |
56+
| | | | *The "with" Statement* |
57+
+------------------+-------------+--------------+---------------------------------------------+
58+
| print_function | 2.6.0a2 | 3.0 | :pep:`3105`: |
59+
| | | | *Make print a function* |
60+
+------------------+-------------+--------------+---------------------------------------------+
61+
| unicode_literals | 2.6.0a2 | 3.0 | :pep:`3112`: |
62+
| | | | *Bytes literals in Python 3000* |
63+
+------------------+-------------+--------------+---------------------------------------------+
64+
| generator_stop | 3.5.0b1 | 3.7 | :pep:`479`: |
65+
| | | | *StopIteration handling inside generators* |
66+
+------------------+-------------+--------------+---------------------------------------------+
67+
| annotations | 3.7.0b1 | Never [1]_ | :pep:`563`: |
68+
| | | | *Postponed evaluation of annotations*, |
69+
| | | | :pep:`649`: *Deferred evaluation of |
70+
| | | | annotations using descriptors* |
71+
+------------------+-------------+--------------+---------------------------------------------+
8672

8773
.. XXX Adding a new entry? Remember to update simple_stmts.rst, too.
8874

0 commit comments

Comments
 (0)