From 079bfc962d838cb80a008ad3d949222256e1228d Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sat, 19 May 2012 18:34:06 +0300 Subject: #14494: Document that absolute imports became default in 3.0 instead of 2.7. --- Doc/library/__future__.rst | 2 +- Lib/__future__.py | 2 +- Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Doc/library/__future__.rst b/Doc/library/__future__.rst index 0acccc5..72f2963 100644 --- 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 8f8a490..3b2d5ec 100644 --- a/Lib/__future__.py +++ b/Lib/__future__.py @@ -114,7 +114,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 d8ffe35..bea7eba 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -598,6 +598,7 @@ Ken Manheimer Vladimir Marangozov David Marek Doug Marien +Sven Marnach Alex Martelli Anthony Martin Owen Martin diff --git a/Misc/NEWS b/Misc/NEWS index ead1bbf..4bc3d1b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ What's New in Python 3.2.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. -- cgit v0.12