diff options
| author | Georg Brandl <georg@python.org> | 2014-03-02 08:50:10 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-03-02 08:50:10 +0100 |
| commit | 9337daca276efcc1c58058a10fffef8b356c7b58 (patch) | |
| tree | 49f519acf9c000d0fa4deefc94f7ac45498f7ac0 /sphinx/transforms.py | |
| parent | 30799b02fa7b5c4c4269775b90bd59de4d46f802 (diff) | |
| parent | 4bf6795898b5156073cd243965b5a03c3b6c0536 (diff) | |
| download | sphinx-9337daca276efcc1c58058a10fffef8b356c7b58.tar.gz | |
merge with stable
Diffstat (limited to 'sphinx/transforms.py')
| -rw-r--r-- | sphinx/transforms.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sphinx/transforms.py b/sphinx/transforms.py index e28c75f6..ec3dd727 100644 --- a/sphinx/transforms.py +++ b/sphinx/transforms.py @@ -23,7 +23,6 @@ from sphinx.util import split_index_msg from sphinx.util.nodes import traverse_translatable_index, extract_messages from sphinx.util.osutil import ustrftime, find_catalog from sphinx.util.compat import docutils_version -from sphinx.util.pycompat import all from sphinx.domains.std import ( make_term_from_paragraph_node, make_termnodes_from_paragraph_node, @@ -70,7 +69,7 @@ class MoveModuleTargets(Transform): for node in self.document.traverse(nodes.target): if not node['ids']: continue - if (node.has_key('ismod') and + if ('ismod' in node and node.parent.__class__ is nodes.section and # index 0 is the section title node node.parent.index(node) == 1): @@ -143,10 +142,7 @@ class CustomLocaleReporter(object): self.source, self.line = source, line def set_reporter(self, document): - if docutils_version < (0, 9): - document.reporter.locator = self.get_source_and_line - else: - document.reporter.get_source_and_line = self.get_source_and_line + document.reporter.get_source_and_line = self.get_source_and_line def get_source_and_line(self, lineno=None): return self.source, self.line |