From 94bd56e4e4bfeea6aaf06d2144b2b7c3309d4d0a Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 6 Sep 2008 17:34:35 +0000 Subject: [PATCH] Some pylint-found fixes and cleanups. --- sphinx/_jinja.py | 2 +- sphinx/environment.py | 2 -- sphinx/ext/autodoc.py | 1 - sphinx/ext/jsmath.py | 2 +- sphinx/ext/pngmath.py | 2 +- sphinx/latexwriter.py | 3 --- sphinx/textwriter.py | 20 ++++++++++---------- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/sphinx/_jinja.py b/sphinx/_jinja.py index 0bc1534ff..d6e98b214 100644 --- a/sphinx/_jinja.py +++ b/sphinx/_jinja.py @@ -74,7 +74,7 @@ class TranslatorEnvironment(Environment): return self.trans.ugettext(string) def ngettext(self, singular, plural, n): - return senf.trans.ungettext(singular, plural, n) + return self.trans.ungettext(singular, plural, n) def __init__(self, *args, **kwargs): self.translator = kwargs['translator'] diff --git a/sphinx/environment.py b/sphinx/environment.py index 5679fd101..1b20a38b8 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -38,7 +38,6 @@ from docutils.parsers.rst import roles from docutils.parsers.rst.languages import en as english from docutils.transforms import Transform from docutils.transforms.parts import ContentsFilter -from docutils.transforms.universal import FilterMessages # monkey-patch reST parser to disable alphabetic and roman enumerated lists from docutils.parsers.rst.states import Body @@ -516,7 +515,6 @@ class BuildEnvironment: self.docname = None self.currmodule = None self.currclass = None - self.indexnum = 0 self.gloss_entries = set() if save_parsed: diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 450169f2b..18efb02f9 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -15,7 +15,6 @@ import re import sys import types import inspect -import textwrap import linecache from types import FunctionType, BuiltinMethodType, MethodType diff --git a/sphinx/ext/jsmath.py b/sphinx/ext/jsmath.py index de5332f90..bd2579de5 100644 --- a/sphinx/ext/jsmath.py +++ b/sphinx/ext/jsmath.py @@ -13,7 +13,7 @@ from docutils import nodes from sphinx.application import ExtensionError -from sphinx.ext.mathbase import setup as mathbase_setup, wrap_displaymath +from sphinx.ext.mathbase import setup as mathbase_setup def html_visit_math(self, node): diff --git a/sphinx/ext/pngmath.py b/sphinx/ext/pngmath.py index 4fdcdc4f3..9f628e110 100644 --- a/sphinx/ext/pngmath.py +++ b/sphinx/ext/pngmath.py @@ -17,7 +17,7 @@ import posixpath from os import path from subprocess import Popen, PIPE try: - from hashlib import sha + from hashlib import sha1 as sha except ImportError: from sha import sha diff --git a/sphinx/latexwriter.py b/sphinx/latexwriter.py index 7cfd12e49..196ed6d9a 100644 --- a/sphinx/latexwriter.py +++ b/sphinx/latexwriter.py @@ -226,9 +226,6 @@ class LaTeXTranslator(nodes.NodeVisitor): self.highlightlinenothreshold = node['linenothreshold'] raise nodes.SkipNode - def visit_comment(self, node): - raise nodes.SkipNode - def visit_section(self, node): if not self.this_is_the_title: self.sectionlevel += 1 diff --git a/sphinx/textwriter.py b/sphinx/textwriter.py index c0346da0f..088405052 100644 --- a/sphinx/textwriter.py +++ b/sphinx/textwriter.py @@ -447,30 +447,30 @@ class TextTranslator(nodes.NodeVisitor): def depart_admonition(self, node): self.end_state() - def visit_admonition(self, node): + def _visit_admonition(self, node): self.new_state(2) def _make_depart_admonition(name): def depart_admonition(self, node): self.end_state(first=admonitionlabels[name] + ': ') return depart_admonition - visit_attention = visit_admonition + visit_attention = _visit_admonition depart_attention = _make_depart_admonition('attention') - visit_caution = visit_admonition + visit_caution = _visit_admonition depart_caution = _make_depart_admonition('caution') - visit_danger = visit_admonition + visit_danger = _visit_admonition depart_danger = _make_depart_admonition('danger') - visit_error = visit_admonition + visit_error = _visit_admonition depart_error = _make_depart_admonition('error') - visit_hint = visit_admonition + visit_hint = _visit_admonition depart_hint = _make_depart_admonition('hint') - visit_important = visit_admonition + visit_important = _visit_admonition depart_important = _make_depart_admonition('important') - visit_note = visit_admonition + visit_note = _visit_admonition depart_note = _make_depart_admonition('note') - visit_tip = visit_admonition + visit_tip = _visit_admonition depart_tip = _make_depart_admonition('tip') - visit_warning = visit_admonition + visit_warning = _visit_admonition depart_warning = _make_depart_admonition('warning') def visit_versionmodified(self, node):