2to3: Fix callable.
Merge pull request #3047 from charris/2to3-callable

2to3: Fix callable.