diff options
| author | Petri Lehtinen <petri@digip.org> | 2012-05-19 15:38:27 (GMT) |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2012-05-19 15:38:43 (GMT) |
| commit | 7c5ba513b924692e534e372a135add15e70ac0cb (patch) | |
| tree | e60f818cded262cb576ee794f2418f5d28771a7d | |
| parent | ed1183db8b10c6955729824bf5f5bdc430878001 (diff) | |
| parent | 079bfc962d838cb80a008ad3d949222256e1228d (diff) | |
| download | cpython-7c5ba513b924692e534e372a135add15e70ac0cb.zip cpython-7c5ba513b924692e534e372a135add15e70ac0cb.tar.gz cpython-7c5ba513b924692e534e372a135add15e70ac0cb.tar.bz2 | |
#14494: Document that absolute imports became default in 3.0 instead of 2.7.
| -rw-r--r-- | Doc/library/__future__.rst | 2 | ||||
| -rw-r--r-- | Lib/__future__.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 6 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), @@ -10,6 +10,10 @@ What's New in Python 3.3.0 Alpha 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 #9260: A finer-grained import lock. Most of the import sequence now uses per-module locks rather than the global import lock, eliminating well-known issues with threads and imports. |