From 2f37a149399dfa4bdf58b2a0dd574cc58e06f021 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 16 Mar 2008 13:12:48 +0000
Subject: [PATCH] Some pylint fixes.

---
 Makefile               | 2 +-
 sphinx/builder.py      | 2 +-
 sphinx/ext/autodoc.py  | 1 -
 sphinx/ext/coverage.py | 1 -
 sphinx/highlighting.py | 1 -
 sphinx/linkcheck.py    | 2 +-
 sphinx/quickstart.py   | 4 ++--
 utils/pylintrc         | 2 +-
 8 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index f309cc221..871ac2e7e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ clean-patchfiles:
 	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 .
diff --git a/sphinx/builder.py b/sphinx/builder.py
index 0e94b93ea..0ca86c850 100644
--- a/sphinx/builder.py
+++ b/sphinx/builder.py
@@ -31,7 +31,7 @@ from sphinx.htmlwriter import HTMLWriter, HTMLTranslator, SmartyPantsHTMLTransla
 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
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 1cf2a77c9..3639930f5 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -19,7 +19,6 @@ from docutils import nodes
 from docutils.parsers.rst import directives
 from docutils.statemachine import ViewList
 
-from sphinx import addnodes
 from sphinx.util import rpartition
 
 try:
diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py
index e3ebf1db2..d7a55cbc6 100644
--- a/sphinx/ext/coverage.py
+++ b/sphinx/ext/coverage.py
@@ -10,7 +10,6 @@
     :license: BSD.
 """
 
-import os
 import re
 import glob
 import inspect
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index af17017a0..a7685a436 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -22,7 +22,6 @@ try:
     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
diff --git a/sphinx/linkcheck.py b/sphinx/linkcheck.py
index b10c5bdb5..f67e11948 100644
--- a/sphinx/linkcheck.py
+++ b/sphinx/linkcheck.py
@@ -16,7 +16,7 @@ from urllib2 import build_opener, HTTPError
 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()
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 7e6da3f38..f8c75ab0e 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -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 = '''\
diff --git a/utils/pylintrc b/utils/pylintrc
index aa04e12e5..2552a12c8 100644
--- a/utils/pylintrc
+++ b/utils/pylintrc
@@ -49,7 +49,7 @@ load-plugins=
 #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]