Merge "Remove Python 2 residue; use Python 3 idioms" into main

Author: zzzeek

doc/build/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Mako documentation build configuration file
 #
@@ -78,8 +77,8 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"Mako"
-copyright = u"the Mako authors and contributors"
+project = "Mako"
+copyright = "the Mako authors and contributors"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -89,7 +88,7 @@
 version = mako.__version__
 # The full version, including alpha/beta/rc tags.
 release = "1.1.5"
-
+release_date = None
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # language = None
@@ -230,8 +229,8 @@
     (
         "index",
         "mako_%s.tex" % release.replace(".", "_"),
-        u"Mako Documentation",
-        u"Mike Bayer",
+        "Mako Documentation",
+        "Mike Bayer",
         "manual",
     )
 ]
@@ -269,16 +268,16 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("index", "mako", u"Mako Documentation", [u"Mako authors"], 1)]
+man_pages = [("index", "mako", "Mako Documentation", ["Mako authors"], 1)]
 
 
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u"Mako"
-epub_author = u"Mako authors"
-epub_publisher = u"Mako authors"
-epub_copyright = u"Mako authors"
+epub_title = "Mako"
+epub_author = "Mako authors"
+epub_publisher = "Mako authors"
+epub_copyright = "Mako authors"
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.

mako/ast.py

@@ -107,7 +107,7 @@ def __init__(self, code, **exception_kwargs):
                 "Unsupported control keyword: '%s'" % keyword,
                 **exception_kwargs,
             )
-        super(PythonFragment, self).__init__(code, **exception_kwargs)
+        super().__init__(code, **exception_kwargs)
 
 
 class FunctionDecl:
@@ -199,6 +199,4 @@ class FunctionArgs(FunctionDecl):
     """the argument portion of a function declaration"""
 
     def __init__(self, code, **kwargs):
-        super(FunctionArgs, self).__init__(
-            "def ANON(%s):pass" % code, **kwargs
-        )
+        super().__init__("def ANON(%s):pass" % code, **kwargs)

mako/cmd.py

@@ -4,7 +4,6 @@
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 from argparse import ArgumentParser
-import io
 from os.path import dirname
 from os.path import isfile
 import sys
@@ -92,9 +91,7 @@ def cmdline(argv=None):
         _exit()
     else:
         if output_file:
-            io.open(output_file, "wt", encoding=output_encoding).write(
-                rendered
-            )
+            open(output_file, "wt", encoding=output_encoding).write(rendered)
         else:
             sys.stdout.write(rendered)
 

mako/compat.py

@@ -24,11 +24,11 @@ def inspect_getargspec(func):
     if inspect.ismethod(func):
         func = func.__func__
     if not inspect.isfunction(func):
-        raise TypeError("{!r} is not a Python function".format(func))
+        raise TypeError(f"{func!r} is not a Python function")
 
     co = func.__code__
     if not inspect.iscode(co):
-        raise TypeError("{!r} is not a code object".format(co))
+        raise TypeError(f"{co!r} is not a code object")
 
     nargs = co.co_argcount
     names = co.co_varnames

mako/ext/babelplugin.py

@@ -20,7 +20,7 @@ def __init__(self, keywords, comment_tags, options):
                 "input_encoding", options.get("encoding", None)
             ),
         }
-        super(BabelMakoExtractor, self).__init__()
+        super().__init__()
 
     def __call__(self, fileobj):
         return self.process_file(fileobj)

mako/ext/beaker_cache.py

@@ -40,7 +40,7 @@ def __init__(self, cache):
                 _beaker_cache = cache.template.cache_args["manager"]
             else:
                 _beaker_cache = beaker_cache.CacheManager()
-        super(BeakerCacheImpl, self).__init__(cache)
+        super().__init__(cache)
 
     def _get_cache(self, **kw):
         expiretime = kw.pop("timeout", None)

mako/ext/pygmentplugin.py

@@ -106,33 +106,31 @@ class MakoHtmlLexer(DelegatingLexer):
     aliases = ["html+mako"]
 
     def __init__(self, **options):
-        super(MakoHtmlLexer, self).__init__(HtmlLexer, MakoLexer, **options)
+        super().__init__(HtmlLexer, MakoLexer, **options)
 
 
 class MakoXmlLexer(DelegatingLexer):
     name = "XML+Mako"
     aliases = ["xml+mako"]
 
     def __init__(self, **options):
-        super(MakoXmlLexer, self).__init__(XmlLexer, MakoLexer, **options)
+        super().__init__(XmlLexer, MakoLexer, **options)
 
 
 class MakoJavascriptLexer(DelegatingLexer):
     name = "JavaScript+Mako"
     aliases = ["js+mako", "javascript+mako"]
 
     def __init__(self, **options):
-        super(MakoJavascriptLexer, self).__init__(
-            JavascriptLexer, MakoLexer, **options
-        )
+        super().__init__(JavascriptLexer, MakoLexer, **options)
 
 
 class MakoCssLexer(DelegatingLexer):
     name = "CSS+Mako"
     aliases = ["css+mako"]
 
     def __init__(self, **options):
-        super(MakoCssLexer, self).__init__(CssLexer, MakoLexer, **options)
+        super().__init__(CssLexer, MakoLexer, **options)
 
 
 pygments_html_formatter = HtmlFormatter(

mako/parsetree.py

@@ -50,7 +50,7 @@ class TemplateNode(Node):
     """a 'container' node that stores the overall collection of nodes."""
 
     def __init__(self, filename):
-        super(TemplateNode, self).__init__("", 0, 0, filename)
+        super().__init__("", 0, 0, filename)
         self.nodes = []
         self.page_attributes = {}
 
@@ -79,7 +79,7 @@ class ControlLine(Node):
     has_loop_context = False
 
     def __init__(self, keyword, isend, text, **kwargs):
-        super(ControlLine, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.text = text
         self.keyword = keyword
         self.isend = isend
@@ -127,7 +127,7 @@ class Text(Node):
     """defines plain text in the template."""
 
     def __init__(self, content, **kwargs):
-        super(Text, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.content = content
 
     def __repr__(self):
@@ -152,7 +152,7 @@ class Code(Node):
     """
 
     def __init__(self, text, ismodule, **kwargs):
-        super(Code, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.text = text
         self.ismodule = ismodule
         self.code = ast.PythonCode(text, **self.exception_kwargs)
@@ -179,7 +179,7 @@ class Comment(Node):
     """
 
     def __init__(self, text, **kwargs):
-        super(Comment, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.text = text
 
     def __repr__(self):
@@ -194,7 +194,7 @@ class Expression(Node):
     """
 
     def __init__(self, text, escapes, **kwargs):
-        super(Expression, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.text = text
         self.escapes = escapes
         self.escapes_code = ast.ArgumentList(escapes, **self.exception_kwargs)
@@ -228,7 +228,7 @@ class _TagMeta(type):
     def __init__(cls, clsname, bases, dict_):
         if getattr(cls, "__keyword__", None) is not None:
             cls._classmap[cls.__keyword__] = cls
-        super(_TagMeta, cls).__init__(clsname, bases, dict_)
+        super().__init__(clsname, bases, dict_)
 
     def __call__(cls, keyword, attributes, **kwargs):
         if ":" in keyword:
@@ -293,7 +293,7 @@ def __init__(
          other arguments passed to the Node superclass (lineno, pos)
 
         """
-        super(Tag, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.keyword = keyword
         self.attributes = attributes
         self._parse_attributes(expressions, nonexpressions)
@@ -377,7 +377,7 @@ class IncludeTag(Tag):
     __keyword__ = "include"
 
     def __init__(self, keyword, attributes, **kwargs):
-        super(IncludeTag, self).__init__(
+        super().__init__(
             keyword,
             attributes,
             ("file", "import", "args"),
@@ -396,16 +396,14 @@ def undeclared_identifiers(self):
         identifiers = self.page_args.undeclared_identifiers.difference(
             {"__DUMMY"}
         ).difference(self.page_args.declared_identifiers)
-        return identifiers.union(
-            super(IncludeTag, self).undeclared_identifiers()
-        )
+        return identifiers.union(super().undeclared_identifiers())
 
 
 class NamespaceTag(Tag):
     __keyword__ = "namespace"
 
     def __init__(self, keyword, attributes, **kwargs):
-        super(NamespaceTag, self).__init__(
+        super().__init__(
             keyword,
             attributes,
             ("file",),
@@ -435,9 +433,7 @@ class TextTag(Tag):
     __keyword__ = "text"
 
     def __init__(self, keyword, attributes, **kwargs):
-        super(TextTag, self).__init__(
-            keyword, attributes, (), ("filter"), (), **kwargs
-        )
+        super().__init__(keyword, attributes, (), ("filter"), (), **kwargs)
         self.filter_args = ast.ArgumentList(
             attributes.get("filter", ""), **self.exception_kwargs
         )
@@ -456,7 +452,7 @@ def __init__(self, keyword, attributes, **kwargs):
             c for c in attributes if c.startswith("cache_")
         ]
 
-        super(DefTag, self).__init__(
+        super().__init__(
             keyword,
             attributes,
             expressions,
@@ -519,7 +515,7 @@ def __init__(self, keyword, attributes, **kwargs):
             c for c in attributes if c.startswith("cache_")
         ]
 
-        super(BlockTag, self).__init__(
+        super().__init__(
             keyword,
             attributes,
             expressions,
@@ -575,7 +571,7 @@ class CallTag(Tag):
     __keyword__ = "call"
 
     def __init__(self, keyword, attributes, **kwargs):
-        super(CallTag, self).__init__(
+        super().__init__(
             keyword, attributes, ("args"), ("expr",), ("expr",), **kwargs
         )
         self.expression = attributes["expr"]
@@ -595,7 +591,7 @@ def undeclared_identifiers(self):
 
 class CallNamespaceTag(Tag):
     def __init__(self, namespace, defname, attributes, **kwargs):
-        super(CallNamespaceTag, self).__init__(
+        super().__init__(
             namespace + ":" + defname,
             attributes,
             tuple(attributes.keys()) + ("args",),
@@ -632,7 +628,7 @@ class InheritTag(Tag):
     __keyword__ = "inherit"
 
     def __init__(self, keyword, attributes, **kwargs):
-        super(InheritTag, self).__init__(
+        super().__init__(
             keyword, attributes, ("file",), (), ("file",), **kwargs
         )
 
@@ -648,9 +644,7 @@ def __init__(self, keyword, attributes, **kwargs):
             "enable_loop",
         ] + [c for c in attributes if c.startswith("cache_")]
 
-        super(PageTag, self).__init__(
-            keyword, attributes, expressions, (), (), **kwargs
-        )
+        super().__init__(keyword, attributes, expressions, (), (), **kwargs)
         self.body_decl = ast.FunctionArgs(
             attributes.get("args", ""), **self.exception_kwargs
         )

test/ext/test_babelplugin.py

@@ -103,7 +103,7 @@ def test_extract_utf8(self):
         )
         self.addCleanup(mako_tmpl.close)
         message = next(
-            extract(mako_tmpl, set(["_", None]), [], {"encoding": "utf-8"})
+            extract(mako_tmpl, {"_", None}, [], {"encoding": "utf-8"})
         )
         assert message == (1, "_", "K\xf6ln", [])
 
@@ -114,7 +114,7 @@ def test_extract_cp1251(self):
         )
         self.addCleanup(mako_tmpl.close)
         message = next(
-            extract(mako_tmpl, set(["_", None]), [], {"encoding": "cp1251"})
+            extract(mako_tmpl, {"_", None}, [], {"encoding": "cp1251"})
         )
         # "test" in Rusian. File encoding is cp1251 (aka "windows-1251")
         assert message == (1, "_", "\u0442\u0435\u0441\u0442", [])