[Python-checkins] r61947 - in doctools/trunk/sphinx: builder.py ext/coverage.py

[georg.brandl]

Author: georg.brandl
Date: Wed Mar 26 14:21:39 2008
New Revision: 61947

Modified:
   doctools/trunk/sphinx/builder.py
   doctools/trunk/sphinx/ext/coverage.py
Log:
Pylint fixing.


Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Wed Mar 26 14:21:39 2008
@@ -25,8 +25,7 @@
 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 @@
         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.'))
 

Modified: doctools/trunk/sphinx/ext/coverage.py
==============================================================================
--- doctools/trunk/sphinx/ext/coverage.py	(original)
+++ doctools/trunk/sphinx/ext/coverage.py	Wed Mar 26 14:21:39 2008
@@ -49,7 +49,7 @@
             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():