define callable to builtin callable when it's available on the latest py3 versions (fixes #17)

2 files changed, 10 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index 314a87e..86f621c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ This file lists the changes in each six version.
 Development version
 -------------------
 
+- Issue #17: Define callable to be builtin callable when it is available again
+  in Python 3.2+.
+
 - Issue #16: Rename Python 2 exec_'s arguments, so casually calling exec_ with
   keyword arguments will raise.
 
diff --git a/six.py b/six.py
index 4fc0d2c..ab45e38 100644
--- a/six.py
+++ b/six.py
@@ -235,14 +235,18 @@ except NameError:
 next = advance_iterator
 
 
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
 if PY3:
     def get_unbound_function(unbound):
         return unbound
 
     Iterator = object
-
-    def callable(obj):
-        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
 else:
     def get_unbound_function(unbound):
         return unbound.im_func