diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-12-16 00:24:21 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-16 00:24:21 +0900 |
commit | 79eec90f36f5a74e24cfd6740126396fd6567e07 (patch) | |
tree | a7c8d2087ee1f50dadb5ca78343ac10c6959b740 /sphinx/writers/html5.py | |
parent | 0031c9b4822ae9684888ae90bc70d6ceb3313581 (diff) | |
parent | 6bc357140dbb074eb0d590c1226009f83f97862e (diff) | |
download | sphinx-git-79eec90f36f5a74e24cfd6740126396fd6567e07.tar.gz |
Merge pull request #5773 from tk0miya/fix_typehints_for_unicode
Replace all "unicode" type by "str"
Diffstat (limited to 'sphinx/writers/html5.py')
-rw-r--r-- | sphinx/writers/html5.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sphinx/writers/html5.py b/sphinx/writers/html5.py index 3c1f54965..7385c14d6 100644 --- a/sphinx/writers/html5.py +++ b/sphinx/writers/html5.py @@ -29,7 +29,6 @@ if False: # For type annotation from typing import Any # NOQA from sphinx.builders.html import StandaloneHTMLBuilder # NOQA - from sphinx.util.typing import unicode # NOQA logger = logging.getLogger(__name__) @@ -256,7 +255,7 @@ class HTML5Translator(SphinxTranslator, BaseTranslator): # overwritten def visit_admonition(self, node, name=''): - # type: (nodes.Element, unicode) -> None + # type: (nodes.Element, str) -> None self.body.append(self.starttag( node, 'div', CLASS=('admonition ' + name))) if name: @@ -293,7 +292,7 @@ class HTML5Translator(SphinxTranslator, BaseTranslator): def add_fignumber(self, node): # type: (nodes.Element) -> None def append_fignumber(figtype, figure_id): - # type: (unicode, unicode) -> None + # type: (str, str) -> None if self.builder.name == 'singlehtml': key = u"%s/%s" % (self.docnames[-1], figtype) else: @@ -319,7 +318,7 @@ class HTML5Translator(SphinxTranslator, BaseTranslator): append_fignumber(figtype, node['ids'][0]) def add_permalink_ref(self, node, title): - # type: (nodes.Element, unicode) -> None + # type: (nodes.Element, str) -> None if node['ids'] and self.permalink_text and self.builder.add_permalinks: format = u'<a class="headerlink" href="#%s" title="%s">%s</a>' self.body.append(format % (node['ids'][0], title, self.permalink_text)) @@ -807,26 +806,26 @@ class HTML5Translator(SphinxTranslator, BaseTranslator): node['classes'].append('field-odd') def visit_math(self, node, math_env=''): - # type: (nodes.Element, unicode) -> None + # type: (nodes.Element, str) -> None name = self.builder.math_renderer_name visit, _ = self.builder.app.registry.html_inline_math_renderers[name] visit(self, node) def depart_math(self, node, math_env=''): - # type: (nodes.Element, unicode) -> None + # type: (nodes.Element, str) -> None name = self.builder.math_renderer_name _, depart = self.builder.app.registry.html_inline_math_renderers[name] if depart: depart(self, node) def visit_math_block(self, node, math_env=''): - # type: (nodes.Element, unicode) -> None + # type: (nodes.Element, str) -> None name = self.builder.math_renderer_name visit, _ = self.builder.app.registry.html_block_math_renderers[name] visit(self, node) def depart_math_block(self, node, math_env=''): - # type: (nodes.Element, unicode) -> None + # type: (nodes.Element, str) -> None name = self.builder.math_renderer_name _, depart = self.builder.app.registry.html_block_math_renderers[name] if depart: @@ -840,21 +839,21 @@ class HTML5Translator(SphinxTranslator, BaseTranslator): @property def highlightlang(self): - # type: () -> unicode + # type: () -> str warnings.warn('HTMLTranslator.highlightlang is deprecated.', RemovedInSphinx30Warning, stacklevel=2) return self.builder.config.highlight_language @property def highlightlang_base(self): - # type: () -> unicode + # type: () -> str warnings.warn('HTMLTranslator.highlightlang_base is deprecated.', RemovedInSphinx30Warning, stacklevel=2) return self.builder.config.highlight_language @property def highlightopts(self): - # type: () -> unicode + # type: () -> str warnings.warn('HTMLTranslator.highlightopts is deprecated.', RemovedInSphinx30Warning, stacklevel=2) return self.builder.config.highlight_options |