summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2011-08-06 04:54:23 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2011-08-06 04:54:23 (GMT)
commita3b2316a1b858c889dcaeddc4c4ec890b42ddf5a (patch)
tree357b01c689c8627bad33772567615f296372973d
parent89976f1cdc49c909f808f8bb1ec15ac963acbc93 (diff)
downloadcpython-a3b2316a1b858c889dcaeddc4c4ec890b42ddf5a.zip
cpython-a3b2316a1b858c889dcaeddc4c4ec890b42ddf5a.tar.gz
cpython-a3b2316a1b858c889dcaeddc4c4ec890b42ddf5a.tar.bz2
merge from 2.7 - Fix closes issue11047 - Correct the 2.7 whatsnew description for issue 7902.
-rw-r--r--Doc/whatsnew/2.7.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index d715617..98f8515 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -782,8 +782,8 @@ Some smaller changes made to the core Python language are:
(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`.)