python-checkins at python
Sep 6, 2008, 10:34 AM
Post #1 of 1
(35 views)
Permalink
|
|
r66257 - in doctools/trunk/sphinx: _jinja.py environment.py ext/autodoc.py ext/jsmath.py ext/pngmath.py latexwriter.py textwriter.py
|
|
Author: georg.brandl
Date: Sat Sep 6 19:34:35 2008
New Revision: 66257
Log:
Some pylint-found fixes and cleanups.
Modified:
doctools/trunk/sphinx/_jinja.py
doctools/trunk/sphinx/environment.py
doctools/trunk/sphinx/ext/autodoc.py
doctools/trunk/sphinx/ext/jsmath.py
doctools/trunk/sphinx/ext/pngmath.py
doctools/trunk/sphinx/latexwriter.py
doctools/trunk/sphinx/textwriter.py
Modified: doctools/trunk/sphinx/_jinja.py
==============================================================================
--- doctools/trunk/sphinx/_jinja.py (original)
+++ doctools/trunk/sphinx/_jinja.py Sat Sep 6 19:34:35 2008
@@ -74,7 +74,7 @@
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']
Modified: doctools/trunk/sphinx/environment.py
==============================================================================
--- doctools/trunk/sphinx/environment.py (original)
+++ doctools/trunk/sphinx/environment.py Sat Sep 6 19:34:35 2008
@@ -38,7 +38,6 @@
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 @@
self.docname = None
self.currmodule = None
self.currclass = None
- self.indexnum = 0
self.gloss_entries = set()
if save_parsed:
Modified: doctools/trunk/sphinx/ext/autodoc.py
==============================================================================
--- doctools/trunk/sphinx/ext/autodoc.py (original)
+++ doctools/trunk/sphinx/ext/autodoc.py Sat Sep 6 19:34:35 2008
@@ -15,7 +15,6 @@
import sys
import types
import inspect
-import textwrap
import linecache
from types import FunctionType, BuiltinMethodType, MethodType
Modified: doctools/trunk/sphinx/ext/jsmath.py
==============================================================================
--- doctools/trunk/sphinx/ext/jsmath.py (original)
+++ doctools/trunk/sphinx/ext/jsmath.py Sat Sep 6 19:34:35 2008
@@ -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):
Modified: doctools/trunk/sphinx/ext/pngmath.py
==============================================================================
--- doctools/trunk/sphinx/ext/pngmath.py (original)
+++ doctools/trunk/sphinx/ext/pngmath.py Sat Sep 6 19:34:35 2008
@@ -17,7 +17,7 @@
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
Modified: doctools/trunk/sphinx/latexwriter.py
==============================================================================
--- doctools/trunk/sphinx/latexwriter.py (original)
+++ doctools/trunk/sphinx/latexwriter.py Sat Sep 6 19:34:35 2008
@@ -226,9 +226,6 @@
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
Modified: doctools/trunk/sphinx/textwriter.py
==============================================================================
--- doctools/trunk/sphinx/textwriter.py (original)
+++ doctools/trunk/sphinx/textwriter.py Sat Sep 6 19:34:35 2008
@@ -447,30 +447,30 @@
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):
_______________________________________________
Python-checkins mailing list
Python-checkins[at]python.org
http://mail.python.org/mailman/listinfo/python-checkins
|
