[Python-checkins] cpython (merge 3.2 -> default): #11897: Merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/968fba3f34b3
changeset:   69508:968fba3f34b3
parent:      69506:96e0e79d33de
parent:      69507:05a7d3048c49
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Apr 21 14:49:56 2011 +0300
summary:
  #11897: Merge with 3.2.

files:
  Doc/howto/pyporting.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -247,8 +247,8 @@
 Python that you can utilize.
 
 
-``from __future__ import absolute_imports``
-'''''''''''''''''''''''''''''''''''''''''''
+``from __future__ import absolute_import``
+''''''''''''''''''''''''''''''''''''''''''
 
 Implicit relative imports (e.g., importing ``spam.bacon`` from within
 ``spam.eggs`` with the statement ``import bacon``) does not work in Python 3.

-- 
Repository URL: http://hg.python.org/cpython