diff options
author | shimizukawa <shimizukawa@gmail.com> | 2013-12-15 16:25:01 +0900 |
---|---|---|
committer | shimizukawa <shimizukawa@gmail.com> | 2013-12-15 16:25:01 +0900 |
commit | 22bff8279d4d2d0096152337ae2b6b3951f92e29 (patch) | |
tree | c842781bd53c01f5da8b9f5239632616cef0318c /sphinx | |
parent | 8b375619a7a91d26f07f1ba944757700ae82827f (diff) | |
download | sphinx-22bff8279d4d2d0096152337ae2b6b3951f92e29.tar.gz |
Drop docutils-0.7, 0.8 and 0.9 support
Diffstat (limited to 'sphinx')
-rw-r--r-- | sphinx/__init__.py | 12 | ||||
-rw-r--r-- | sphinx/builders/manpage.py | 5 | ||||
-rw-r--r-- | sphinx/transforms.py | 5 | ||||
-rw-r--r-- | sphinx/util/nodes.py | 21 | ||||
-rw-r--r-- | sphinx/writers/manpage.py | 13 |
5 files changed, 14 insertions, 42 deletions
diff --git a/sphinx/__init__.py b/sphinx/__init__.py index bbd45b24..7fa3bfe9 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -71,12 +71,12 @@ def main(argv=sys.argv): sys.stderr.write(hint) return 1 raise - if sys.version_info[:3] >= (3, 3, 0): - from sphinx.util.compat import docutils_version - if docutils_version < (0, 10): - sys.stderr.write('Error: Sphinx requires at least ' - 'Docutils 0.10 for Python 3.3 and above.\n') - return 1 + + from sphinx.util.compat import docutils_version + if docutils_version < (0, 10): + sys.stderr.write('Error: Sphinx requires at least Docutils 0.10 to ' + 'run.\n') + return 1 return cmdline.main(argv) diff --git a/sphinx/builders/manpage.py b/sphinx/builders/manpage.py index 7783f8b8..e3bf05e5 100644 --- a/sphinx/builders/manpage.py +++ b/sphinx/builders/manpage.py @@ -20,7 +20,7 @@ from sphinx.builders import Builder from sphinx.environment import NoUri from sphinx.util.nodes import inline_all_toctrees from sphinx.util.console import bold, darkgreen -from sphinx.writers.manpage import ManualPageWriter, has_manpage_writer +from sphinx.writers.manpage import ManualPageWriter class ManualPageBuilder(Builder): @@ -32,9 +32,6 @@ class ManualPageBuilder(Builder): supported_image_types = [] def init(self): - if not has_manpage_writer: - raise SphinxError('The docutils manual page writer can\'t be ' - 'found; it is only available as of docutils 0.6.') if not self.config.man_pages: self.warn('no "man_pages" config value found; no manual pages ' 'will be written') diff --git a/sphinx/transforms.py b/sphinx/transforms.py index 35e9d297..38fd08a5 100644 --- a/sphinx/transforms.py +++ b/sphinx/transforms.py @@ -142,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 diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py index da9b4be6..9373b331 100644 --- a/sphinx/util/nodes.py +++ b/sphinx/util/nodes.py @@ -223,12 +223,7 @@ def set_source_info(directive, node): directive.state_machine.get_source_and_line(directive.lineno) def set_role_source_info(inliner, lineno, node): - try: - node.source, node.line = \ - inliner.reporter.locator(lineno) - except AttributeError: - # docutils 0.9+ - node.source, node.line = inliner.reporter.get_source_and_line(lineno) + node.source, node.line = inliner.reporter.get_source_and_line(lineno) # monkey-patch Element.copy to copy the rawsource @@ -236,17 +231,3 @@ def _new_copy(self): return self.__class__(self.rawsource, **self.attributes) nodes.Element.copy = _new_copy - -# monkey-patch Element.__repr__ to return str if it returns unicode. -# Was fixed in docutils since 0.10. See sf.net/p/docutils/bugs/218/. - -if sys.version_info < (3,): - _element_repr_orig = nodes.Element.__repr__ - - def _new_repr(self): - s = _element_repr_orig(self) - if isinstance(s, unicode): - return s.encode('utf-8') - return s - - nodes.Element.__repr__ = _new_repr diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py index f652e918..406f3ff5 100644 --- a/sphinx/writers/manpage.py +++ b/sphinx/writers/manpage.py @@ -10,14 +10,11 @@ """ from docutils import nodes -try: - from docutils.writers.manpage import MACRO_DEF, Writer, \ - Translator as BaseTranslator - has_manpage_writer = True -except ImportError: - # define the classes in any case, sphinx.application needs it - Writer = BaseTranslator = object - has_manpage_writer = False +from docutils.writers.manpage import ( + MACRO_DEF, + Writer, + Translator as BaseTranslator +) from sphinx import addnodes from sphinx.locale import admonitionlabels, _ |