#14494: Document that absolute imports became default in 3.0 instead of 2.7.

diff --git a/Doc/library/__future__.rst b/Doc/library/__future__.rst
index 87e120514a10eb4ef072936d36eb972a0e291311..329e4110292281c2a8f2dfb268e9d8a9e15b86fe 100644 (file)
--- a/Doc/library/__future__.rst
+++ b/Doc/library/__future__.rst
@@ -75,7 +75,7 @@ language using this mechanism:
 | division         | 2.2.0a2     | 3.0          | :pep:`238`:                                 |
 |                  |             |              | *Changing the Division Operator*            |
 +------------------+-------------+--------------+---------------------------------------------+
-| absolute_import  | 2.5.0a1     | 2.7          | :pep:`328`:                                 |
+| absolute_import  | 2.5.0a1     | 3.0          | :pep:`328`:                                 |
 |                  |             |              | *Imports: Multi-Line and Absolute/Relative* |
 +------------------+-------------+--------------+---------------------------------------------+
 | with_statement   | 2.5.0a1     | 2.6          | :pep:`343`:                                 |

diff --git a/Lib/__future__.py b/Lib/__future__.py
index 915645933c034153325649c7b49e39ce6724f093..e0996eb007bf2673dd253b71a336127777353183 100644 (file)
--- a/Lib/__future__.py
+++ b/Lib/__future__.py
@@ -112,7 +112,7 @@ division = _Feature((2, 2, 0, "alpha", 2),
                     CO_FUTURE_DIVISION)
 
 absolute_import = _Feature((2, 5, 0, "alpha", 1),
-                           (2, 7, 0, "alpha", 0),
+                           (3, 0, 0, "alpha", 0),
                            CO_FUTURE_ABSOLUTE_IMPORT)
 
 with_statement = _Feature((2, 5, 0, "alpha", 1),

diff --git a/Misc/ACKS b/Misc/ACKS
index ca1f5dcadf019bcd5b84d867963c8d0be12acb87..2844dfac98557ecb26ccff6f39b45825edc35833 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -544,6 +544,7 @@ Ken Manheimer
 Vladimir Marangozov
 David Marek
 Doug Marien
+Sven Marnach
 Alex Martelli
 Anthony Martin
 Sébastien Martini

diff --git a/Misc/NEWS b/Misc/NEWS
index be559608ee7cce38e0b048caa2983aeb34626b22..e8ce85d8f8c04441e063f494558eb2698b7ec2a2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,10 @@ What's New in Python 2.7.4
 Core and Builtins
 -----------------
 
+- Issue #14494: Fix __future__.py and its documentation to note that
+  absolute imports are the default behavior in 3.0 instead of 2.7.
+  Patch by Sven Marnach.
+
 - Issue #14761: Fix potential leak on an error case in the import machinery.
 
 - Issue #14699: Fix calling the classmethod descriptor directly.