From 710ca3d7c3a41296861b0be79b9904246477968d Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sun, 11 Nov 2018 12:55:22 -0800 Subject: [PATCH] Use super() to call parent class's method --- sphinx/builders/latex/transforms.py | 4 ++-- sphinx/builders/linkcheck.py | 2 +- sphinx/errors.py | 4 ++-- sphinx/ext/imgmath.py | 2 +- sphinx/io.py | 6 +++--- sphinx/search/__init__.py | 2 +- sphinx/testing/util.py | 6 +++--- sphinx/transforms/post_transforms/code.py | 2 +- sphinx/transforms/post_transforms/images.py | 2 +- sphinx/util/docfields.py | 4 ++-- sphinx/util/docutils.py | 8 ++++---- sphinx/writers/html.py | 4 ++-- sphinx/writers/html5.py | 2 +- sphinx/writers/latex.py | 4 ++-- sphinx/writers/manpage.py | 4 ++-- sphinx/writers/texinfo.py | 4 ++-- sphinx/writers/text.py | 4 ++-- sphinx/writers/xml.py | 4 ++-- tests/test_util_fileutil.py | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/sphinx/builders/latex/transforms.py b/sphinx/builders/latex/transforms.py index 8f7cbfcce..dff64ada5 100644 --- a/sphinx/builders/latex/transforms.py +++ b/sphinx/builders/latex/transforms.py @@ -150,7 +150,7 @@ class FootnoteCollector(nodes.NodeVisitor): self.auto_footnotes = [] # type: List[nodes.footnote] self.used_footnote_numbers = set() # type: Set[unicode] self.footnote_refs = [] # type: List[nodes.footnote_reference] - nodes.NodeVisitor.__init__(self, document) + super(FootnoteCollector, self).__init__(document) def unknown_visit(self, node): # type: (nodes.Node) -> None @@ -359,7 +359,7 @@ class LaTeXFootnoteVisitor(nodes.NodeVisitor): self.pendings = [] # type: List[nodes.Node] self.table_footnotes = [] # type: List[nodes.Node] self.restricted = None # type: nodes.Node - nodes.NodeVisitor.__init__(self, document) + super(LaTeXFootnoteVisitor, self).__init__(document) def unknown_visit(self, node): # type: (nodes.Node) -> None diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py index 2189411ee..64308e0fa 100644 --- a/sphinx/builders/linkcheck.py +++ b/sphinx/builders/linkcheck.py @@ -52,7 +52,7 @@ class AnchorCheckParser(html_parser.HTMLParser): def __init__(self, search_anchor): # type: (unicode) -> None - html_parser.HTMLParser.__init__(self) + super(AnchorCheckParser, self).__init__() self.search_anchor = search_anchor self.found = False diff --git a/sphinx/errors.py b/sphinx/errors.py index 005605f1c..43b63ea05 100644 --- a/sphinx/errors.py +++ b/sphinx/errors.py @@ -54,7 +54,7 @@ class ExtensionError(SphinxError): def __init__(self, message, orig_exc=None): # type: (unicode, Exception) -> None - SphinxError.__init__(self, message) + super(ExtensionError, self).__init__(message) self.message = message self.orig_exc = orig_exc @@ -67,7 +67,7 @@ class ExtensionError(SphinxError): def __str__(self): # type: () -> str - parent_str = SphinxError.__str__(self) + parent_str = super(ExtensionError, self).__str__() if self.orig_exc: return '%s (exception: %s)' % (parent_str, self.orig_exc) return parent_str diff --git a/sphinx/ext/imgmath.py b/sphinx/ext/imgmath.py index cbd38b84c..14db7e739 100644 --- a/sphinx/ext/imgmath.py +++ b/sphinx/ext/imgmath.py @@ -49,7 +49,7 @@ class MathExtError(SphinxError): msg += '\n[stderr]\n' + stderr.decode(sys_encoding, 'replace') if stdout: msg += '\n[stdout]\n' + stdout.decode(sys_encoding, 'replace') - SphinxError.__init__(self, msg) + super(MathExtError, self).__init__(msg) class InvokeError(SphinxError): diff --git a/sphinx/io.py b/sphinx/io.py index 979af7a99..de6432983 100644 --- a/sphinx/io.py +++ b/sphinx/io.py @@ -66,7 +66,7 @@ class SphinxBaseReader(standalone.Reader): def __init__(self, app, *args, **kwargs): # type: (Sphinx, Any, Any) -> None self.env = app.env - standalone.Reader.__init__(self, *args, **kwargs) + super(SphinxBaseReader, self).__init__(*args, **kwargs) def get_transforms(self): # type: () -> List[Type[Transform]] @@ -106,7 +106,7 @@ class SphinxStandaloneReader(SphinxBaseReader): def __init__(self, app, *args, **kwargs): # type: (Sphinx, Any, Any) -> None self.transforms = self.transforms + app.registry.get_transforms() - SphinxBaseReader.__init__(self, app, *args, **kwargs) + super(SphinxStandaloneReader, self).__init__(app, *args, **kwargs) class SphinxI18nReader(SphinxBaseReader): @@ -171,7 +171,7 @@ class SphinxBaseFileInput(FileInput): codecs.register_error('sphinx', self.warn_and_replace) # type: ignore kwds['error_handler'] = 'sphinx' # py3: handle error on open. - FileInput.__init__(self, *args, **kwds) + super(SphinxBaseFileInput, self).__init__(*args, **kwds) def decode(self, data): # type: (Union[unicode, bytes]) -> unicode diff --git a/sphinx/search/__init__.py b/sphinx/search/__init__.py index 4ae96fb57..99cb869ec 100644 --- a/sphinx/search/__init__.py +++ b/sphinx/search/__init__.py @@ -195,7 +195,7 @@ class WordCollector(NodeVisitor): def __init__(self, document, lang): # type: (nodes.Node, SearchLanguage) -> None - NodeVisitor.__init__(self, document) + super(WordCollector, self).__init__(document) self.found_words = [] # type: List[unicode] self.found_title_words = [] # type: List[unicode] self.lang = lang diff --git a/sphinx/testing/util.py b/sphinx/testing/util.py index cd2073aaa..3c687b378 100644 --- a/sphinx/testing/util.py +++ b/sphinx/testing/util.py @@ -137,9 +137,9 @@ class SphinxTestApp(application.Sphinx): if v.startswith('visit_')) try: - application.Sphinx.__init__(self, srcdir, confdir, outdir, doctreedir, # type: ignore # NOQA - buildername, confoverrides, status, warning, - freshenv, warningiserror, tags) + super(SphinxTestApp, self).__init__(srcdir, confdir, outdir, doctreedir, # type: ignore # NOQA + buildername, confoverrides, status, warning, + freshenv, warningiserror, tags) except Exception: self.cleanup() raise diff --git a/sphinx/transforms/post_transforms/code.py b/sphinx/transforms/post_transforms/code.py index 86143ffb4..3e7cbcb1a 100644 --- a/sphinx/transforms/post_transforms/code.py +++ b/sphinx/transforms/post_transforms/code.py @@ -54,7 +54,7 @@ class HighlightLanguageVisitor(nodes.NodeVisitor): # type: (nodes.document, unicode) -> None self.default_setting = HighlightSetting(default_language, sys.maxsize) self.settings = [] # type: List[HighlightSetting] - nodes.NodeVisitor.__init__(self, document) + super(HighlightLanguageVisitor, self).__init__(document) def unknown_visit(self, node): # type: (nodes.Node) -> None diff --git a/sphinx/transforms/post_transforms/images.py b/sphinx/transforms/post_transforms/images.py index a6b82f262..877292615 100644 --- a/sphinx/transforms/post_transforms/images.py +++ b/sphinx/transforms/post_transforms/images.py @@ -203,7 +203,7 @@ class ImageConverter(BaseImageConverter): self.available = None # type: bool # the converter is available or not. # Will be checked at first conversion - BaseImageConverter.__init__(self, *args, **kwargs) # type: ignore + super(ImageConverter, self).__init__(*args, **kwargs) def match(self, node): # type: (nodes.Node) -> bool diff --git a/sphinx/util/docfields.py b/sphinx/util/docfields.py index d0899130e..be8189a6b 100644 --- a/sphinx/util/docfields.py +++ b/sphinx/util/docfields.py @@ -138,7 +138,7 @@ class GroupedField(Field): def __init__(self, name, names=(), label=None, rolename=None, can_collapse=False): # type: (unicode, Tuple[unicode, ...], unicode, unicode, bool) -> None - Field.__init__(self, name, names, label, True, rolename) + super(GroupedField, self).__init__(name, names, label, True, rolename) self.can_collapse = can_collapse def make_field(self, @@ -190,7 +190,7 @@ class TypedField(GroupedField): def __init__(self, name, names=(), typenames=(), label=None, rolename=None, typerolename=None, can_collapse=False): # type: (unicode, Tuple[unicode, ...], Tuple[unicode, ...], unicode, unicode, unicode, bool) -> None # NOQA - GroupedField.__init__(self, name, names, label, rolename, can_collapse) + super(TypedField, self).__init__(name, names, label, rolename, can_collapse) self.typenames = typenames self.typerolename = typerolename diff --git a/sphinx/util/docutils.py b/sphinx/util/docutils.py index 9ce4087ac..334465213 100644 --- a/sphinx/util/docutils.py +++ b/sphinx/util/docutils.py @@ -247,8 +247,8 @@ class LoggingReporter(Reporter): error_handler='backslashreplace'): # type: (unicode, int, int, bool, unicode) -> None stream = WarningStream() - Reporter.__init__(self, source, report_level, halt_level, - stream, debug, error_handler=error_handler) + super(LoggingReporter, self).__init__(source, report_level, halt_level, + stream, debug, error_handler=error_handler) class NullReporter(Reporter): @@ -256,7 +256,7 @@ class NullReporter(Reporter): def __init__(self): # type: () -> None - Reporter.__init__(self, '', 999, 4) + super(NullReporter, self).__init__('', 999, 4) def is_html5_writer_available(): @@ -307,7 +307,7 @@ class SphinxFileOutput(FileOutput): def __init__(self, **kwargs): # type: (Any) -> None self.overwrite_if_changed = kwargs.pop('overwrite_if_changed', False) - FileOutput.__init__(self, **kwargs) + super(SphinxFileOutput, self).__init__(**kwargs) def write(self, data): # type: (unicode) -> unicode diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py index 66f3bf8f4..0f9289dca 100644 --- a/sphinx/writers/html.py +++ b/sphinx/writers/html.py @@ -47,7 +47,7 @@ class HTMLWriter(Writer): def __init__(self, builder): # type: (StandaloneHTMLBuilder) -> None - Writer.__init__(self) + super(HTMLWriter, self).__init__() self.builder = builder def translate(self): @@ -73,7 +73,7 @@ class HTMLTranslator(BaseTranslator): def __init__(self, builder, *args, **kwds): # type: (StandaloneHTMLBuilder, Any, Any) -> None - BaseTranslator.__init__(self, *args, **kwds) + super(HTMLTranslator, self).__init__(*args, **kwds) self.highlighter = builder.highlighter self.builder = builder self.docnames = [builder.current_docname] # for singlehtml builder diff --git a/sphinx/writers/html5.py b/sphinx/writers/html5.py index 41c665cdd..7be729aa4 100644 --- a/sphinx/writers/html5.py +++ b/sphinx/writers/html5.py @@ -43,7 +43,7 @@ class HTML5Translator(BaseTranslator): def __init__(self, builder, *args, **kwds): # type: (StandaloneHTMLBuilder, Any, Any) -> None - BaseTranslator.__init__(self, *args, **kwds) + super(HTML5Translator, self).__init__(*args, **kwds) self.highlighter = builder.highlighter self.builder = builder self.docnames = [builder.current_docname] # for singlehtml builder diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index 265b17a10..207f7513a 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -193,7 +193,7 @@ class LaTeXWriter(writers.Writer): def __init__(self, builder): # type: (Builder) -> None - writers.Writer.__init__(self) + super(LaTeXWriter, self).__init__() self.builder = builder def translate(self): @@ -451,7 +451,7 @@ class LaTeXTranslator(nodes.NodeVisitor): def __init__(self, document, builder): # type: (nodes.Node, Builder) -> None - nodes.NodeVisitor.__init__(self, document) + super(LaTeXTranslator, self).__init__(document) self.builder = builder self.body = [] # type: List[unicode] diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py index 471e58813..806aa32a9 100644 --- a/sphinx/writers/manpage.py +++ b/sphinx/writers/manpage.py @@ -32,7 +32,7 @@ logger = logging.getLogger(__name__) class ManualPageWriter(Writer): def __init__(self, builder): # type: (Builder) -> None - Writer.__init__(self) + super(ManualPageWriter, self).__init__() self.builder = builder def translate(self): @@ -82,7 +82,7 @@ class ManualPageTranslator(BaseTranslator): def __init__(self, builder, *args, **kwds): # type: (Builder, Any, Any) -> None - BaseTranslator.__init__(self, *args, **kwds) + super(ManualPageTranslator, self).__init__(*args, **kwds) self.builder = builder self.in_productionlist = 0 diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py index 65d513d08..77faa63f1 100644 --- a/sphinx/writers/texinfo.py +++ b/sphinx/writers/texinfo.py @@ -128,7 +128,7 @@ class TexinfoWriter(writers.Writer): def __init__(self, builder): # type: (TexinfoBuilder) -> None - writers.Writer.__init__(self) + super(TexinfoWriter, self).__init__() self.builder = builder def translate(self): @@ -161,7 +161,7 @@ class TexinfoTranslator(nodes.NodeVisitor): def __init__(self, document, builder): # type: (nodes.Node, TexinfoBuilder) -> None - nodes.NodeVisitor.__init__(self, document) + super(TexinfoTranslator, self).__init__(document) self.builder = builder self.init_settings() diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py index b5392c9bc..b47243366 100644 --- a/sphinx/writers/text.py +++ b/sphinx/writers/text.py @@ -382,7 +382,7 @@ class TextWriter(writers.Writer): def __init__(self, builder): # type: (TextBuilder) -> None - writers.Writer.__init__(self) + super(TextWriter, self).__init__() self.builder = builder def translate(self): @@ -397,7 +397,7 @@ class TextTranslator(nodes.NodeVisitor): def __init__(self, document, builder): # type: (nodes.Node, TextBuilder) -> None - nodes.NodeVisitor.__init__(self, document) + super(TextTranslator, self).__init__(document) self.builder = builder newlines = builder.config.text_newlines diff --git a/sphinx/writers/xml.py b/sphinx/writers/xml.py index f94fe847c..1fa0ecee9 100644 --- a/sphinx/writers/xml.py +++ b/sphinx/writers/xml.py @@ -22,7 +22,7 @@ class XMLWriter(BaseXMLWriter): def __init__(self, builder): # type: (Builder) -> None - BaseXMLWriter.__init__(self) + super(XMLWriter, self).__init__() self.builder = builder self.translator_class = self.builder.get_translator_class() @@ -49,7 +49,7 @@ class PseudoXMLWriter(writers.Writer): def __init__(self, builder): # type: (Builder) -> None - writers.Writer.__init__(self) + super(PseudoXMLWriter, self).__init__() self.builder = builder def translate(self): diff --git a/tests/test_util_fileutil.py b/tests/test_util_fileutil.py index 7b54d5dc1..11f40ad78 100644 --- a/tests/test_util_fileutil.py +++ b/tests/test_util_fileutil.py @@ -17,7 +17,7 @@ from sphinx.util.fileutil import copy_asset, copy_asset_file class DummyTemplateLoader(BuiltinTemplateLoader): def __init__(self): - BuiltinTemplateLoader.__init__(self) + super(DummyTemplateLoader, self).__init__() builder = mock.Mock() builder.config.templates_path = [] builder.app.translater = None