Mercurial > p > roundup > code
diff roundup/instance.py @ 5406:5a871a250670
Python 3 preparation: use isinstance(x, collections.Callable) instead of callable(x).
Tool-assisted patch.
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Wed, 25 Jul 2018 00:13:52 +0000 |
| parents | 23b8e6067f7c |
| children | 5258e89e896a |
line wrap: on
line diff
--- a/roundup/instance.py Tue Jul 24 23:51:41 2018 +0000 +++ b/roundup/instance.py Wed Jul 25 00:13:52 2018 +0000 @@ -33,6 +33,7 @@ except ImportError: import __builtin__ as builtins +import collections import os import sys import warnings @@ -133,14 +134,14 @@ 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'):