From dd13084557f46343b9fac0c02725a826d0ca397b Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Wed, 27 Feb 2013 18:34:50 -0700 Subject: 2to3: Fix callable. --- doc/sphinxext/linkcode.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/sphinxext/linkcode.py') diff --git a/doc/sphinxext/linkcode.py b/doc/sphinxext/linkcode.py index 1b1ef4a77..f1dffd337 100644 --- a/doc/sphinxext/linkcode.py +++ b/doc/sphinxext/linkcode.py @@ -10,6 +10,7 @@ """ import warnings +import collections warnings.warn("This extension has been submitted to Sphinx upstream. " "Use the version from there if it is accepted " "https://bitbucket.org/birkenfeld/sphinx/pull-request/47/sphinxextlinkcode", @@ -29,7 +30,7 @@ def doctree_read(app, doctree): env = app.builder.env resolve_target = getattr(env.config, 'linkcode_resolve', None) - if not callable(env.config.linkcode_resolve): + if not isinstance(env.config.linkcode_resolve, collections.Callable): raise LinkcodeError( "Function `linkcode_resolve` is not given in conf.py") -- cgit v1.2.1