summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-06-28 13:18:14 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-06-28 13:18:14 (GMT)
commit77cec6ea23f13746599e1b22a1b67f4a9e0b3438 (patch)
treef1c822b219055d926a4bb4b386db077c67c371fc /Doc/whatsnew
parent99c48a8d315fe55c8e1e8eac2e01cd930cb89686 (diff)
downloadcpython-77cec6ea23f13746599e1b22a1b67f4a9e0b3438.zip
cpython-77cec6ea23f13746599e1b22a1b67f4a9e0b3438.tar.gz
cpython-77cec6ea23f13746599e1b22a1b67f4a9e0b3438.tar.bz2
fix typo
Diffstat (limited to 'Doc/whatsnew')
-rw-r--r--Doc/whatsnew/2.6.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 3e6190c..bb6034b 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -1284,12 +1284,12 @@ Other Language Changes
Here are all of the changes that Python 2.6 makes to the core Python language.
* The :func:`hasattr` function was catching and ignoring all errors,
- under the assumption that they meant a :meth:`__getattr__` method has
- failing somewhere and the return value of :func:`hasattr` would therefore
- be ``False``. This logic shouldn't be applied to
- :exc:`KeyboardInterrupt` and :exc:`SystemExit`, however; Python 2.6 will
- no longer discard such exceptions when :func:`hasattr` encounters them.
- (Fixed by Benjamin Peterson; :issue:`2196`.)
+ under the assumption that they meant a :meth:`__getattr__` method
+ was failing somewhere and the return value of :func:`hasattr` would
+ therefore be ``False``. This logic shouldn't be applied to
+ :exc:`KeyboardInterrupt` and :exc:`SystemExit`, however; Python 2.6
+ will no longer discard such exceptions when :func:`hasattr`
+ encounters them. (Fixed by Benjamin Peterson; :issue:`2196`.)
* When calling a function using the ``**`` syntax to provide keyword
arguments, you are no longer required to use a Python dictionary;