diff options
Diffstat (limited to 'sphinx')
| -rw-r--r-- | sphinx/builders/epub.py | 2 | ||||
| -rw-r--r-- | sphinx/builders/gettext.py | 2 | ||||
| -rw-r--r-- | sphinx/directives/other.py | 7 | ||||
| -rw-r--r-- | sphinx/environment.py | 3 | ||||
| -rw-r--r-- | sphinx/ext/graphviz.py | 1 | ||||
| -rw-r--r-- | sphinx/quickstart.py | 7 | ||||
| -rw-r--r-- | sphinx/util/pycompat.py | 2 | ||||
| -rw-r--r-- | sphinx/writers/texinfo.py | 2 |
8 files changed, 10 insertions, 16 deletions
diff --git a/sphinx/builders/epub.py b/sphinx/builders/epub.py index 0488942c..fbde5697 100644 --- a/sphinx/builders/epub.py +++ b/sphinx/builders/epub.py @@ -30,7 +30,7 @@ from docutils import nodes from sphinx import addnodes from sphinx.builders.html import StandaloneHTMLBuilder -from sphinx.util.osutil import ensuredir, EEXIST +from sphinx.util.osutil import ensuredir, copyfile, EEXIST from sphinx.util.smartypants import sphinx_smarty_pants as ssp from sphinx.util.console import brown diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py index 80a24299..7a6e1abe 100644 --- a/sphinx/builders/gettext.py +++ b/sphinx/builders/gettext.py @@ -17,7 +17,7 @@ from collections import defaultdict from sphinx.builders import Builder from sphinx.util import split_index_msg from sphinx.util.nodes import extract_messages, traverse_translatable_index -from sphinx.util.osutil import SEP, safe_relpath, ensuredir, find_catalog +from sphinx.util.osutil import safe_relpath, ensuredir, find_catalog from sphinx.util.console import darkgreen from sphinx.locale import pairindextypes diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py index 75a19915..59931a55 100644 --- a/sphinx/directives/other.py +++ b/sphinx/directives/other.py @@ -7,8 +7,6 @@ :license: BSD, see LICENSE for details. """ -import os - from docutils import nodes from docutils.parsers.rst import Directive, directives from docutils.parsers.rst.directives.admonitions import BaseAdmonition @@ -20,7 +18,6 @@ from sphinx.locale import _ from sphinx.util import url_re, docname_join from sphinx.util.nodes import explicit_title_re, set_source_info, \ process_index_entry -from sphinx.util.compat import make_admonition from sphinx.util.matching import patfilter @@ -332,8 +329,8 @@ class Only(Directive): self.state.memo.title_styles = [] self.state.memo.section_level = 0 try: - result = self.state.nested_parse(self.content, self.content_offset, - node, match_titles=1) + self.state.nested_parse(self.content, self.content_offset, + node, match_titles=1) title_styles = self.state.memo.title_styles if (not surrounding_title_styles or not title_styles diff --git a/sphinx/environment.py b/sphinx/environment.py index ba1b836b..0ddb4bfb 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -41,8 +41,7 @@ from sphinx.util import url_re, get_matching_docs, docname_join, split_into, \ split_index_msg, FilenameUniqDict from sphinx.util.nodes import clean_astext, make_refnode, extract_messages, \ traverse_translatable_index, WarningStream -from sphinx.util.osutil import movefile, SEP, ustrftime, find_catalog, \ - fs_encoding +from sphinx.util.osutil import SEP, ustrftime, find_catalog, fs_encoding from sphinx.util.matching import compile_matchers from sphinx.util.pycompat import all, class_types from sphinx.util.websupport import is_commentable diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py index 58b52342..a26e34fd 100644 --- a/sphinx/ext/graphviz.py +++ b/sphinx/ext/graphviz.py @@ -14,7 +14,6 @@ import re import codecs import posixpath from os import path -from math import ceil from subprocess import Popen, PIPE try: from hashlib import sha1 as sha diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 705bdb15..8ac943a2 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -881,14 +881,13 @@ def do_prompt(d, key, text, default=None, validator=nonempty): if sys.version_info >= (3, 0): # remove Unicode literal prefixes - _unicode_string_re = re.compile(r"[uU]('.*?')") - def _convert_python_source(source): - return _unicode_string_re.sub('\\1', source) + def _convert_python_source(source, rex=re.compile(r"[uU]('.*?')")): + return rex.sub('\\1', source) for f in ['QUICKSTART_CONF', 'EPUB_CONFIG', 'INTERSPHINX_CONFIG']: globals()[f] = _convert_python_source(globals()[f]) - del _unicode_string_re, _convert_python_source + del _convert_python_source def ask_user(d): diff --git a/sphinx/util/pycompat.py b/sphinx/util/pycompat.py index 3c4e8550..b373c504 100644 --- a/sphinx/util/pycompat.py +++ b/sphinx/util/pycompat.py @@ -134,7 +134,7 @@ else: rel_list = [pardir] * (len(start_list)-i) + path_list[i:] if not rel_list: - return curdir + return start return join(*rel_list) del curdir diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py index ea03dfb2..a8306c11 100644 --- a/sphinx/writers/texinfo.py +++ b/sphinx/writers/texinfo.py @@ -1179,7 +1179,7 @@ class TexinfoTranslator(nodes.NodeVisitor): for id in production.get('ids'): self.add_anchor(id, production) s = production['tokenname'].ljust(maxlen) + ' ::=' - lastname = production['tokenname'] + ##lastname = production['tokenname'] else: s = '%s ' % (' '*maxlen) self.body.append(self.escape(s)) |