[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/9d8a14a550a3
changeset:   73098:9d8a14a550a3
parent:      73093:b82e68cf3b0d
parent:      73097:d9571fb37269
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Oct 24 08:52:30 2011 -0400
summary:
  merge 3.2

files:
  Doc/library/2to3.rst |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -123,7 +123,9 @@
 .. 2to3fixer:: callable
 
    Converts ``callable(x)`` to ``isinstance(x, collections.Callable)``, adding
-   an import to :mod:`collections` if needed.
+   an import to :mod:`collections` if needed. Note ``callable(x)`` has returned
+   in Python 3.2, so if you do not intend to support Python 3.1, you can disable
+   this fixer.
 
 .. 2to3fixer:: dict
 

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