summaryrefslogtreecommitdiff
path: root/sphinx/application.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2016-11-23 13:31:02 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2016-11-23 13:31:02 +0900
commite63afbc60ec6534f3f09bb5cad1f5400da0988f1 (patch)
treed269de11f798dede9f6216829d1cb4f98081d352 /sphinx/application.py
parent43fe104501912077dde3890b392a2518f784bef9 (diff)
parent0ee524e3922089b7ffbd6081c92968ae7dd510c7 (diff)
downloadsphinx-git-e63afbc60ec6534f3f09bb5cad1f5400da0988f1.tar.gz
Merge branch '1.5-release'
Diffstat (limited to 'sphinx/application.py')
-rw-r--r--sphinx/application.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/sphinx/application.py b/sphinx/application.py
index e8e212696..a486069f9 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -315,7 +315,7 @@ class Sphinx(object):
self.info('not yet created')
else:
self.info('failed: %s' % err)
- return self._init_env(freshenv=True)
+ self._init_env(freshenv=True)
def _init_builder(self, buildername):
# type: (unicode) -> None
@@ -488,9 +488,9 @@ class Sphinx(object):
l = 0
for item in iterable:
if l == 0:
- self.info(bold(summary), nonl=1)
+ self.info(bold(summary), nonl=True)
l = 1
- self.info(colorfunc(stringify_func(item)) + ' ', nonl=1)
+ self.info(colorfunc(stringify_func(item)) + ' ', nonl=True)
yield item
if l == 1:
self.info()
@@ -514,7 +514,7 @@ class Sphinx(object):
s += '\n'
else:
s = term_width_line(s)
- self.info(s, nonl=1)
+ self.info(s, nonl=True)
yield item
if l > 0:
self.info()