diff --git a/tests/test_build.py b/tests/test_build.py index b282b6291..9c73c08f0 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -10,13 +10,11 @@ """ import os -import re import sys import difflib from StringIO import StringIO from subprocess import Popen, PIPE -from sphinx.builders.latex import LaTeXBuilder from sphinx.writers.latex import LaTeXTranslator from util import * @@ -59,7 +57,7 @@ def test_latex(app): def kpsetest(filename): try: p = Popen(['kpsewhich', filename], stdout=PIPE) - except OSError, err: + except OSError: # no kpsewhich... either no tex distribution is installed or it is # a "strange" one -- don't bother running latex return None @@ -91,7 +89,7 @@ def test_latex(app): try: p = Popen(['pdflatex', '--interaction=nonstopmode', 'SphinxTests.tex'], stdout=PIPE, stderr=PIPE) - except OSError, err: + except OSError: pass # most likely pdflatex was not found else: stdout, stderr = p.communicate() diff --git a/tests/test_env.py b/tests/test_env.py index c863b52fd..4ecbaac49 100644 --- a/tests/test_env.py +++ b/tests/test_env.py @@ -11,7 +11,6 @@ from util import * -from sphinx.environment import BuildEnvironment from sphinx.builders.html import StandaloneHTMLBuilder from sphinx.builders.latex import LaTeXBuilder diff --git a/tests/test_intersphinx.py b/tests/test_intersphinx.py index 87f2704af..5263d7244 100644 --- a/tests/test_intersphinx.py +++ b/tests/test_intersphinx.py @@ -17,7 +17,7 @@ from docutils import nodes from sphinx import addnodes from sphinx.ext.intersphinx import read_inventory_v1, read_inventory_v2, \ - fetch_inventory, load_mappings, missing_reference + load_mappings, missing_reference from util import * diff --git a/tests/test_markup.py b/tests/test_markup.py index 1b8385170..26c20cf91 100644 --- a/tests/test_markup.py +++ b/tests/test_markup.py @@ -16,7 +16,6 @@ from util import * from docutils import frontend, utils, nodes from docutils.parsers import rst -from sphinx import addnodes from sphinx.util import texescape from sphinx.writers.html import HTMLWriter, SmartyPantsHTMLTranslator from sphinx.writers.latex import LaTeXWriter, LaTeXTranslator diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 1606deb42..8fb6cb214 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -16,7 +16,6 @@ from util import * from nose.tools import assert_equals -from sphinx.environment import BuildEnvironment app = env = None warnings = [] diff --git a/tests/test_search.py b/tests/test_search.py index 15257aebd..0b5b158b8 100644 --- a/tests/test_search.py +++ b/tests/test_search.py @@ -9,12 +9,14 @@ :license: BSD, see LICENSE for details. """ -from docutils import frontend, utils, nodes +from docutils import frontend, utils from docutils.parsers import rst from sphinx.search import IndexBuilder +settings = parser = None + def setup_module(): global settings, parser optparser = frontend.OptionParser(components=(rst.Parser,)) diff --git a/tests/util.py b/tests/util.py index 81728a7aa..1b24af0e2 100644 --- a/tests/util.py +++ b/tests/util.py @@ -8,7 +8,6 @@ """ import sys -import os import StringIO import tempfile import shutil