[Python-checkins] r61424 - in doctools/trunk: Makefile sphinx/builder.py sphinx/ext/autodoc.py sphinx/ext/coverage.py sphinx/highlighting.py sphinx/linkcheck.py sphinx/quickstart.py utils/pylintrc

[georg.brandl]

Author: georg.brandl
Date: Sun Mar 16 14:12:48 2008
New Revision: 61424

Modified:
   doctools/trunk/Makefile
   doctools/trunk/sphinx/builder.py
   doctools/trunk/sphinx/ext/autodoc.py
   doctools/trunk/sphinx/ext/coverage.py
   doctools/trunk/sphinx/highlighting.py
   doctools/trunk/sphinx/linkcheck.py
   doctools/trunk/sphinx/quickstart.py
   doctools/trunk/utils/pylintrc
Log:
Some pylint fixes.


Modified: doctools/trunk/Makefile
==============================================================================
--- doctools/trunk/Makefile	(original)
+++ doctools/trunk/Makefile	Sun Mar 16 14:12:48 2008
@@ -22,7 +22,7 @@
 	find . -name '*.rej' -exec rm -f {} +
 
 pylint:
-	@pylint --rcfile utils/pylintrc sphinx converter
+	@pylint --rcfile utils/pylintrc sphinx
 
 reindent:
 	@$(PYTHON) utils/reindent.py -r -B .

Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Sun Mar 16 14:12:48 2008
@@ -31,7 +31,7 @@
 from sphinx.latexwriter import LaTeXWriter
 from sphinx.environment import BuildEnvironment, NoUri
 from sphinx.highlighting import PygmentsBridge
-from sphinx.util.console import bold, purple, red, darkgreen
+from sphinx.util.console import bold, purple, darkgreen
 
 # side effect: registers roles and directives
 from sphinx import roles

Modified: doctools/trunk/sphinx/ext/autodoc.py
==============================================================================
--- doctools/trunk/sphinx/ext/autodoc.py	(original)
+++ doctools/trunk/sphinx/ext/autodoc.py	Sun Mar 16 14:12:48 2008
@@ -19,7 +19,6 @@
 from docutils.parsers.rst import directives
 from docutils.statemachine import ViewList
 
-from sphinx import addnodes
 from sphinx.util import rpartition
 
 try:

Modified: doctools/trunk/sphinx/ext/coverage.py
==============================================================================
--- doctools/trunk/sphinx/ext/coverage.py	(original)
+++ doctools/trunk/sphinx/ext/coverage.py	Sun Mar 16 14:12:48 2008
@@ -10,7 +10,6 @@
     :license: BSD.
 """
 
-import os
 import re
 import glob
 import inspect

Modified: doctools/trunk/sphinx/highlighting.py
==============================================================================
--- doctools/trunk/sphinx/highlighting.py	(original)
+++ doctools/trunk/sphinx/highlighting.py	Sun Mar 16 14:12:48 2008
@@ -22,7 +22,6 @@
     from pygments.lexers import get_lexer_by_name
     from pygments.formatters import HtmlFormatter, LatexFormatter
     from pygments.filters import ErrorToken
-    from pygments.util import ClassNotFound
     from pygments.style import Style
     from pygments.styles import get_style_by_name
     from pygments.styles.friendly import FriendlyStyle

Modified: doctools/trunk/sphinx/linkcheck.py
==============================================================================
--- doctools/trunk/sphinx/linkcheck.py	(original)
+++ doctools/trunk/sphinx/linkcheck.py	Sun Mar 16 14:12:48 2008
@@ -16,7 +16,7 @@
 from docutils import nodes
 
 from sphinx.builder import Builder
-from sphinx.util.console import bold, purple, red, darkgreen
+from sphinx.util.console import purple, red, darkgreen
 
 # create an opener that will simulate a browser user-agent
 opener = build_opener()

Modified: doctools/trunk/sphinx/quickstart.py
==============================================================================
--- doctools/trunk/sphinx/quickstart.py	(original)
+++ doctools/trunk/sphinx/quickstart.py	Sun Mar 16 14:12:48 2008
@@ -9,10 +9,10 @@
     :license: BSD.
 """
 
-import sys, os, time, shutil
+import sys, os, time
 from os import path
 
-from sphinx.util.console import darkgreen, purple, bold, red, nocolor
+from sphinx.util.console import purple, bold, red, nocolor
 
 
 QUICKSTART_CONF = '''\

Modified: doctools/trunk/utils/pylintrc
==============================================================================
--- doctools/trunk/utils/pylintrc	(original)
+++ doctools/trunk/utils/pylintrc	Sun Mar 16 14:12:48 2008
@@ -49,7 +49,7 @@
 #enable-msg=
 
 # Disable the message(s) with the given id(s).
-disable-msg=C0323,W0142,C0301,C0103,C0111,E0213,C0302,C0203,W0703,R0201
+disable-msg=C0323,W0142,C0301,C0103,C0111,E0213,C0302,C0203,W0703,R0201,W0613,W0612,W0622
 
 
 [REPORTS]