diff options
| author | cocodrips <cocodrips@gmail.com> | 2018-12-26 11:31:44 +0900 |
|---|---|---|
| committer | cocodrips <cocodrips@gmail.com> | 2018-12-26 11:31:50 +0900 |
| commit | 827059be93426b83afd2fc7d823c48681e5f913a (patch) | |
| tree | ec1893e5cf77acbb79d736ea3f841dc864781740 /sphinx/cmd/quickstart.py | |
| parent | 448181d9f97611d352c0c8ec21e55e8242db9d60 (diff) | |
| parent | 99a7dca2160996e3189dfcc2176bbbbac531d5f3 (diff) | |
| download | sphinx-git-827059be93426b83afd2fc7d823c48681e5f913a.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 5842-apidoc-extensions
Diffstat (limited to 'sphinx/cmd/quickstart.py')
| -rw-r--r-- | sphinx/cmd/quickstart.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py index b3db8900e..d3e41aa54 100644 --- a/sphinx/cmd/quickstart.py +++ b/sphinx/cmd/quickstart.py @@ -32,7 +32,6 @@ except ImportError: USE_LIBEDIT = False from docutils.utils import column_width -from six import text_type import sphinx.locale from sphinx import __display_version__, package_dir @@ -158,7 +157,7 @@ def term_decode(text): warnings.warn('term_decode() is deprecated.', RemovedInSphinx40Warning, stacklevel=2) - if isinstance(text, text_type): + if isinstance(text, str): return text # Use the known encoding, if possible @@ -391,10 +390,9 @@ def generate(d, overwrite=True, silent=False, templatedir=None): d['project_underline'] = column_width(d['project']) * '=' d.setdefault('extensions', []) d['copyright'] = time.strftime('%Y') + ', ' + d['author'] - d['author_texescaped'] = text_type(d['author']).\ - translate(texescape.tex_escape_map) + d['author_texescaped'] = d['author'].translate(texescape.tex_escape_map) d['project_doc'] = d['project'] + ' Documentation' - d['project_doc_texescaped'] = text_type(d['project'] + ' Documentation').\ + d['project_doc_texescaped'] = (d['project'] + ' Documentation').\ translate(texescape.tex_escape_map) # escape backslashes and single quotes in strings that are put into |