summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sphinx/builder.py6
-rw-r--r--sphinx/ext/coverage.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/sphinx/builder.py b/sphinx/builder.py
index dc305012f..b522d6e98 100644
--- a/sphinx/builder.py
+++ b/sphinx/builder.py
@@ -25,8 +25,7 @@ from docutils.frontend import OptionParser
from docutils.readers.doctree import Reader as DoctreeReader
from sphinx import addnodes
-from sphinx.util import (get_matching_docs, mtimes_of_files,
- ensuredir, relative_uri, SEP, os_path)
+from sphinx.util import mtimes_of_files, ensuredir, relative_uri, SEP, os_path
from sphinx.htmlhelp import build_hhx
from sphinx.htmlwriter import HTMLWriter, HTMLTranslator, SmartyPantsHTMLTranslator
from sphinx.latexwriter import LaTeXWriter
@@ -230,7 +229,8 @@ class Builder(object):
self.finish()
if self.app._warncount:
self.info(bold('build succeeded, %s warning%s.' %
- (self.app._warncount, self.app._warncount != 1 and 's' or '')))
+ (self.app._warncount,
+ self.app._warncount != 1 and 's' or '')))
else:
self.info(bold('build succeeded.'))
diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py
index d7a55cbc6..9b3826e76 100644
--- a/sphinx/ext/coverage.py
+++ b/sphinx/ext/coverage.py
@@ -49,7 +49,7 @@ class CoverageBuilder(Builder):
try:
self.c_regexes.append((name, re.compile(exp)))
except Exception:
- warnfunc('invalid regex %r in coverage_c_regexes' % exp)
+ self.warn('invalid regex %r in coverage_c_regexes' % exp)
self.c_ignorexps = {}
for (name, exps) in self.config.coverage_ignore_c_items.iteritems():