Python 3 preparation: use isinstance(x, collections.Callable) instead of callable(x).

Tool-assisted patch.

Author: jsm28

roundup/cgi/PageTemplates/Expressions.py

@@ -22,7 +22,7 @@
 for Python expressions, string literals, and paths.
 """
 
-import re, sys
+import collections, re, sys
 from .TALES import Engine, CompilerError, _valid_name, NAME_RE, \
      Undefined, Default, _parse_expr
 
@@ -86,7 +86,7 @@ def render(ob, ns):
         ob = call_with_ns(ob.__render_with_namespace__, ns)
     else:
         base = ob
-        if callable(base):
+        if isinstance(base, collections.Callable):
             try:
                 if getattr(base, 'isDocTemp', 0):
                     ob = call_with_ns(ob, ns, 2)

roundup/instance.py

@@ -33,6 +33,7 @@
 except ImportError:
     import __builtin__ as builtins
 
+import collections
 import os
 import sys
 import warnings
@@ -133,14 +134,14 @@ def open(self, name=None):
         if self.optimize:
             # execute preloaded schema object
             self._exec(self.schema, env)
-            if callable (self.schema_hook):
+            if isinstance(self.schema_hook, collections.Callable):
                 self.schema_hook(**env)
             # use preloaded detectors
             detectors = self.detectors
         else:
             # execute the schema file
             self._execfile('schema.py', env)
-            if callable (self.schema_hook):
+            if isinstance(self.schema_hook, collections.Callable):
                 self.schema_hook(**env)
             # reload extensions and detectors
             for extension in self.get_extensions('extensions'):