[Python-checkins] cpython (3.2): merge from 2.7 - Fix closes issue11047 - Correct the 2.7 whatsnew description

[senthil.kumaran]

http://hg.python.org/cpython/rev/dafdbd0d570a
changeset:   71754:dafdbd0d570a
branch:      3.2
parent:      71751:1d4bd059a9b6
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sat Aug 06 12:54:23 2011 +0800
summary:
  merge from 2.7 - Fix closes issue11047 - Correct the 2.7 whatsnew description for issue 7902.

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


diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -782,8 +782,8 @@
 
   (Contributed by Fredrik Johansson and Victor Stinner; :issue:`3439`.)
 
-* The :keyword:`import` statement will no longer try a relative import
-  if an absolute import (e.g. ``from .os import sep``) fails.  This
+* The :keyword:`import` statement will no longer try an absolute import
+  if a relative import (e.g. ``from .os import sep``) fails.  This
   fixes a bug, but could possibly break certain :keyword:`import`
   statements that were only working by accident.  (Fixed by Meador Inge;
   :issue:`7902`.)

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