summaryrefslogtreecommitdiff
path: root/sphinx/application.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2017-03-19 17:35:06 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2017-03-22 09:51:01 +0900
commit0f47b1d09d4d39a0ac0fe9feb16d1865a84bea75 (patch)
tree2332d4d960192fe22b6bf3509d2c9b12d245794c /sphinx/application.py
parentf3aa62e6859a18706073f38aaedeee9d5e1d3d49 (diff)
downloadsphinx-git-0f47b1d09d4d39a0ac0fe9feb16d1865a84bea75.tar.gz
Drop unused codes
Diffstat (limited to 'sphinx/application.py')
-rw-r--r--sphinx/application.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/sphinx/application.py b/sphinx/application.py
index eeaa954eb..f325935ad 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -207,15 +207,11 @@ class Sphinx(object):
# the config file itself can be an extension
if self.config.setup:
self._setting_up_extension = ['conf.py']
- # py31 doesn't have 'callable' function for below check
- if hasattr(self.config.setup, '__call__'):
- self.config.setup(self)
- else:
- raise ConfigError(
- _("'setup' that is specified in the conf.py has not been "
- "callable. Please provide a callable `setup` function "
- "in order to behave as a sphinx extension conf.py itself.")
- )
+ raise ConfigError(
+ _("'setup' that is specified in the conf.py has not been "
+ "callable. Please provide a callable `setup` function "
+ "in order to behave as a sphinx extension conf.py itself.")
+ )
# now that we know all config values, collect them from conf.py
self.config.init_values()