Remove Python 2 residue; use Python 3 idioms

Fixes #352

Change-Id: I051ec20505464559e9399a8f1ac4a39dc323902a

9 files changed, 38 insertions, 51 deletions

diff --git a/test/ext/test_babelplugin.py b/test/ext/test_babelplugin.py
index 9ef2daf..be3c37a 100644
--- a/test/ext/test_babelplugin.py
+++ b/test/ext/test_babelplugin.py
@@ -103,7 +103,7 @@ class ExtractMakoTestCase(TemplateTest):
         )
         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 @@ class ExtractMakoTestCase(TemplateTest):
         )
         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", [])
diff --git a/test/test_ast.py b/test/test_ast.py
index 3f86a86..29a8a36 100644
--- a/test/test_ast.py
+++ b/test/test_ast.py
@@ -27,17 +27,15 @@ for lar in (1,2,3):
         parsed = ast.PythonCode(code, **exception_kwargs)
         eq_(
             parsed.declared_identifiers,
-            set(
-                ["a", "b", "c", "g", "h", "i", "u", "k", "j", "gh", "lar", "x"]
-            ),
+            {"a", "b", "c", "g", "h", "i", "u", "k", "j", "gh", "lar", "x"},
         )
         eq_(
             parsed.undeclared_identifiers,
-            set(["x", "q", "foo", "gah", "blah"]),
+            {"x", "q", "foo", "gah", "blah"},
         )
 
         parsed = ast.PythonCode("x + 5 * (y-z)", **exception_kwargs)
-        assert parsed.undeclared_identifiers == set(["x", "y", "z"])
+        assert parsed.undeclared_identifiers == {"x", "y", "z"}
         assert parsed.declared_identifiers == set()
 
     def test_locate_identifiers_2(self):
@@ -51,10 +49,10 @@ for x in data:
     result.append(x+7)
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.undeclared_identifiers, set(["get_data"]))
+        eq_(parsed.undeclared_identifiers, {"get_data"})
         eq_(
             parsed.declared_identifiers,
-            set(["result", "data", "x", "hoho", "foobar", "foo", "yaya"]),
+            {"result", "data", "x", "hoho", "foobar", "foo", "yaya"},
         )
 
     def test_locate_identifiers_3(self):
@@ -68,7 +66,7 @@ for y in range(1, y):
 (q for q in range (1, q))
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.undeclared_identifiers, set(["x", "y", "z", "q", "range"]))
+        eq_(parsed.undeclared_identifiers, {"x", "y", "z", "q", "range"})
 
     def test_locate_identifiers_4(self):
         code = """
@@ -78,8 +76,8 @@ def mydef(mydefarg):
     print("mda is", mydefarg)
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.undeclared_identifiers, set(["y"]))
-        eq_(parsed.declared_identifiers, set(["mydef", "x"]))
+        eq_(parsed.undeclared_identifiers, {"y"})
+        eq_(parsed.declared_identifiers, {"mydef", "x"})
 
     def test_locate_identifiers_5(self):
         code = """
@@ -89,7 +87,7 @@ except:
     print(y)
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.undeclared_identifiers, set(["x", "y"]))
+        eq_(parsed.undeclared_identifiers, {"x", "y"})
 
     def test_locate_identifiers_6(self):
         code = """
@@ -97,7 +95,7 @@ def foo():
     return bar()
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.undeclared_identifiers, set(["bar"]))
+        eq_(parsed.undeclared_identifiers, {"bar"})
 
         code = """
 def lala(x, y):
@@ -105,8 +103,8 @@ def lala(x, y):
 print(x)
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.undeclared_identifiers, set(["z", "x"]))
-        eq_(parsed.declared_identifiers, set(["lala"]))
+        eq_(parsed.undeclared_identifiers, {"z", "x"})
+        eq_(parsed.declared_identifiers, {"lala"})
 
         code = """
 def lala(x, y):
@@ -116,15 +114,15 @@ def lala(x, y):
 print(z)
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.undeclared_identifiers, set(["z"]))
-        eq_(parsed.declared_identifiers, set(["lala"]))
+        eq_(parsed.undeclared_identifiers, {"z"})
+        eq_(parsed.declared_identifiers, {"lala"})
 
     def test_locate_identifiers_7(self):
         code = """
 import foo.bar
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.declared_identifiers, set(["foo"]))
+        eq_(parsed.declared_identifiers, {"foo"})
         eq_(parsed.undeclared_identifiers, set())
 
     def test_locate_identifiers_8(self):
@@ -135,7 +133,7 @@ class Hi:
         x = 5
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.declared_identifiers, set(["Hi"]))
+        eq_(parsed.declared_identifiers, {"Hi"})
         eq_(parsed.undeclared_identifiers, set())
 
     def test_locate_identifiers_9(self):
@@ -143,15 +141,15 @@ class Hi:
     ",".join([t for t in ("a", "b", "c")])
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.declared_identifiers, set(["t"]))
-        eq_(parsed.undeclared_identifiers, set(["t"]))
+        eq_(parsed.declared_identifiers, {"t"})
+        eq_(parsed.undeclared_identifiers, {"t"})
 
         code = """
     [(val, name) for val, name in x]
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.declared_identifiers, set(["val", "name"]))
-        eq_(parsed.undeclared_identifiers, set(["val", "name", "x"]))
+        eq_(parsed.declared_identifiers, {"val", "name"})
+        eq_(parsed.undeclared_identifiers, {"val", "name", "x"})
 
     def test_locate_identifiers_10(self):
         code = """
@@ -167,7 +165,7 @@ def x(q):
     return q + 5
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.declared_identifiers, set(["x"]))
+        eq_(parsed.declared_identifiers, {"x"})
         eq_(parsed.undeclared_identifiers, set())
 
     def test_locate_identifiers_12(self):
@@ -178,7 +176,7 @@ def foo():
         t = s
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.declared_identifiers, set(["foo"]))
+        eq_(parsed.declared_identifiers, {"foo"})
         eq_(parsed.undeclared_identifiers, set())
 
     def test_locate_identifiers_13(self):
@@ -189,7 +187,7 @@ def foo():
     Bat
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.declared_identifiers, set(["foo"]))
+        eq_(parsed.declared_identifiers, {"foo"})
         eq_(parsed.undeclared_identifiers, set())
 
     def test_locate_identifiers_14(self):
@@ -202,8 +200,8 @@ def foo():
 print(Bat)
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.declared_identifiers, set(["foo"]))
-        eq_(parsed.undeclared_identifiers, set(["Bat"]))
+        eq_(parsed.declared_identifiers, {"foo"})
+        eq_(parsed.undeclared_identifiers, {"Bat"})
 
     def test_locate_identifiers_16(self):
         code = """
@@ -213,7 +211,7 @@ except Exception as e:
     print(y)
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.undeclared_identifiers, set(["x", "y", "Exception"]))
+        eq_(parsed.undeclared_identifiers, {"x", "y", "Exception"})
 
     def test_locate_identifiers_17(self):
         code = """
@@ -223,7 +221,7 @@ except (Foo, Bar) as e:
     print(y)
 """
         parsed = ast.PythonCode(code, **exception_kwargs)
-        eq_(parsed.undeclared_identifiers, set(["x", "y", "Foo", "Bar"]))
+        eq_(parsed.undeclared_identifiers, {"x", "y", "Foo", "Bar"})
 
     def test_no_global_imports(self):
         code = """
@@ -239,22 +237,22 @@ import x as bar
 
     def test_python_fragment(self):
         parsed = ast.PythonFragment("for x in foo:", **exception_kwargs)
-        eq_(parsed.declared_identifiers, set(["x"]))
-        eq_(parsed.undeclared_identifiers, set(["foo"]))
+        eq_(parsed.declared_identifiers, {"x"})
+        eq_(parsed.undeclared_identifiers, {"foo"})
 
         parsed = ast.PythonFragment("try:", **exception_kwargs)
 
         parsed = ast.PythonFragment(
             "except MyException as e:", **exception_kwargs
         )
-        eq_(parsed.declared_identifiers, set(["e"]))
-        eq_(parsed.undeclared_identifiers, set(["MyException"]))
+        eq_(parsed.declared_identifiers, {"e"})
+        eq_(parsed.undeclared_identifiers, {"MyException"})
 
     def test_argument_list(self):
         parsed = ast.ArgumentList(
             "3, 5, 'hi', x+5, " "context.get('lala')", **exception_kwargs
         )
-        eq_(parsed.undeclared_identifiers, set(["x", "context"]))
+        eq_(parsed.undeclared_identifiers, {"x", "context"})
         eq_(
             [x for x in parsed.args],
             ["3", "5", "'hi'", "(x + 5)", "context.get('lala')"],
diff --git a/test/test_cache.py b/test/test_cache.py
index b48f7fb..60785f2 100644
--- a/test/test_cache.py
+++ b/test/test_cache.py
@@ -652,9 +652,7 @@ class BeakerCacheTest(RealBackendTest, CacheTest):
 
     def _install_mock_cache(self, template, implname=None):
         template.cache_args["manager"] = self._regions()
-        impl = super(BeakerCacheTest, self)._install_mock_cache(
-            template, implname
-        )
+        impl = super()._install_mock_cache(template, implname)
         return impl
 
     def _regions(self):
@@ -680,9 +678,7 @@ class DogpileCacheTest(RealBackendTest, CacheTest):
     def _install_mock_cache(self, template, implname=None):
         template.cache_args["regions"] = self._regions()
         template.cache_args.setdefault("region", "short")
-        impl = super(DogpileCacheTest, self)._install_mock_cache(
-            template, implname
-        )
+        impl = super()._install_mock_cache(template, implname)
         return impl
 
     def _regions(self):
diff --git a/test/test_exceptions.py b/test/test_exceptions.py
index b4246bd..a2b8cf9 100644
--- a/test/test_exceptions.py
+++ b/test/test_exceptions.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import sys
 
 from mako import exceptions
diff --git a/test/test_filters.py b/test/test_filters.py
index abe19c9..b3b4753 100644
--- a/test/test_filters.py
+++ b/test/test_filters.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import unittest
 
 from mako.template import Template
diff --git a/test/test_lexer.py b/test/test_lexer.py
index 08201b2..43b1e7a 100644
--- a/test/test_lexer.py
+++ b/test/test_lexer.py
@@ -26,7 +26,7 @@ def repr_arg(x):
 
 def _as_unicode(arg):
     if isinstance(arg, dict):
-        return dict((k, _as_unicode(v)) for k, v in arg.items())
+        return {k: _as_unicode(v) for k, v in arg.items()}
     else:
         return arg
 
diff --git a/test/test_loop.py b/test/test_loop.py
index 709ec97..be7d440 100644
--- a/test/test_loop.py
+++ b/test/test_loop.py
@@ -199,7 +199,7 @@ class TestLoopContext(unittest.TestCase):
 
     def test_reverse_index(self):
         length = len(self.iterable)
-        expected = tuple([length - i - 1 for i in range(length)])
+        expected = tuple(length - i - 1 for i in range(length))
         actual = tuple(self.ctx.reverse_index for i in self.ctx)
         print(expected, actual)
         assert expected == actual, (
diff --git a/test/test_template.py b/test/test_template.py
index ad7f59d..238b8c6 100644
--- a/test/test_template.py
+++ b/test/test_template.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import unittest
 
diff --git a/test/test_util.py b/test/test_util.py
index be987fe..6aa4c47 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import sys
 import unittest