summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew/3.0.rst
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-12 16:04:32 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-10-12 16:04:32 (GMT)
commit143d034ecd110f8543eba4ad76dfb6085cdaeb3d (patch)
tree9ddcfc6fe0d0cf8ce8558f88969bf1f9e98c1d25 /Doc/whatsnew/3.0.rst
parentc3de6d63cd20cd26a288999d454124cb72eb57fe (diff)
parent7a9953edfbbd51dbda60ab31c0e5db5eea968b53 (diff)
downloadcpython-143d034ecd110f8543eba4ad76dfb6085cdaeb3d.zip
cpython-143d034ecd110f8543eba4ad76dfb6085cdaeb3d.tar.gz
cpython-143d034ecd110f8543eba4ad76dfb6085cdaeb3d.tar.bz2
merge 3.2
Diffstat (limited to 'Doc/whatsnew/3.0.rst')
-rw-r--r--Doc/whatsnew/3.0.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst
index 762977c..7782663 100644
--- a/Doc/whatsnew/3.0.rst
+++ b/Doc/whatsnew/3.0.rst
@@ -771,7 +771,7 @@ Operators And Special Methods
respectively).
* :pep:`3114`: the standard :meth:`next` method has been renamed to
- :meth:`__next__`.
+ :meth:`~iterator.__next__`.
* The :meth:`__oct__` and :meth:`__hex__` special methods are removed
-- :func:`oct` and :func:`hex` use :meth:`__index__` now to convert
@@ -807,7 +807,7 @@ Builtins
To get the old behavior of :func:`input`, use ``eval(input())``.
* A new built-in function :func:`next` was added to call the
- :meth:`__next__` method on an object.
+ :meth:`~iterator.__next__` method on an object.
* The :func:`round` function rounding strategy and return type have
changed. Exact halfway cases are now rounded to the nearest even