From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 6 Jan 2017 20:00:01 +0000 (+0100)
Subject: Cleaned up shitty syntax in testsuite
X-Git-Tag: 2.9~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73e2b510526c1520a9bfff2d9e5775e65d95ce10;p=thirdparty%2Fjinja.git

Cleaned up shitty syntax in testsuite
---

diff --git a/tests/test_api.py b/tests/test_api.py
index c358d01b..90a143b7 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -23,7 +23,7 @@ from jinja2.utils import Cycler
 
 @pytest.mark.api
 @pytest.mark.extended
-class TestExtendedAPI():
+class TestExtendedAPI(object):
 
     def test_item_and_attribute(self, env):
         from jinja2.sandbox import SandboxedEnvironment
@@ -107,7 +107,7 @@ class TestExtendedAPI():
 
 @pytest.mark.api
 @pytest.mark.meta
-class TestMeta():
+class TestMeta(object):
 
     def test_find_undeclared_variables(self, env):
         ast = env.parse('{% set foo = 42 %}{{ bar + foo }}')
@@ -155,7 +155,7 @@ class TestMeta():
 
 @pytest.mark.api
 @pytest.mark.streaming
-class TestStreaming():
+class TestStreaming(object):
 
     def test_basic_streaming(self, env):
         tmpl = env.from_string("<ul>{% for item in seq %}<li>{{ loop.index "
@@ -199,7 +199,7 @@ class TestStreaming():
 
 @pytest.mark.api
 @pytest.mark.undefined
-class TestUndefined():
+class TestUndefined(object):
 
     def test_stopiteration_is_undefined(self):
         def test():
@@ -309,7 +309,7 @@ class TestUndefined():
 
 @pytest.mark.api
 @pytest.mark.lowlevel
-class TestLowLevel():
+class TestLowLevel(object):
 
     def test_custom_code_generator(self):
         class CustomCodeGenerator(CodeGenerator):
diff --git a/tests/test_bytecode_cache.py b/tests/test_bytecode_cache.py
index 2ffe4c60..7a601293 100644
--- a/tests/test_bytecode_cache.py
+++ b/tests/test_bytecode_cache.py
@@ -24,7 +24,7 @@ def env(package_loader):
 
 
 @pytest.mark.byte_code_cache
-class TestByteCodeCache():
+class TestByteCodeCache(object):
 
     def test_simple(self, env):
         tmpl = env.get_template('test.html')
diff --git a/tests/test_ext.py b/tests/test_ext.py
index 9a5bdfd6..3a06a42e 100644
--- a/tests/test_ext.py
+++ b/tests/test_ext.py
@@ -160,7 +160,7 @@ class StreamFilterExtension(Extension):
 
 
 @pytest.mark.ext
-class TestExtensions():
+class TestExtensions(object):
 
     def test_extend_late(self):
         env = Environment()
@@ -246,7 +246,7 @@ class TestExtensions():
 
 
 @pytest.mark.ext
-class TestInternationalization():
+class TestInternationalization(object):
 
     def test_trans(self):
         tmpl = i18n_env.get_template('child.html')
@@ -315,7 +315,7 @@ class TestInternationalization():
 
 
 @pytest.mark.ext
-class TestNewstyleInternationalization():
+class TestNewstyleInternationalization(object):
 
     def test_trans(self):
         tmpl = newstyle_i18n_env.get_template('child.html')
@@ -397,7 +397,7 @@ class TestNewstyleInternationalization():
 
 
 @pytest.mark.ext
-class TestAutoEscape():
+class TestAutoEscape(object):
 
     def test_scoped_setting(self):
         env = Environment(extensions=['jinja2.ext.autoescape'],
diff --git a/tests/test_imports.py b/tests/test_imports.py
index ade253ed..67591270 100644
--- a/tests/test_imports.py
+++ b/tests/test_imports.py
@@ -26,7 +26,7 @@ def test_env():
 
 
 @pytest.mark.imports
-class TestImports():
+class TestImports(object):
 
     def test_context_imports(self, test_env):
         t = test_env.from_string('{% import "module" as m %}{{ m.test() }}')
@@ -74,7 +74,7 @@ class TestImports():
 
 @pytest.mark.imports
 @pytest.mark.includes
-class TestIncludes():
+class TestIncludes(object):
 
     def test_context_include(self, test_env):
         t = test_env.from_string('{% include "header" %}')
diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py
index 1cb73904..32e2c68d 100644
--- a/tests/test_inheritance.py
+++ b/tests/test_inheritance.py
@@ -78,7 +78,7 @@ def env():
 
 
 @pytest.mark.inheritance
-class TestInheritance():
+class TestInheritance(object):
 
     def test_layout(self, env):
         tmpl = env.get_template('layout')
@@ -201,7 +201,7 @@ class TestInheritance():
 
 
 @pytest.mark.inheritance
-class TestBugFix():
+class TestBugFix(object):
 
     def test_fixed_macro_scoping_bug(self, env):
         assert Environment(loader=DictLoader({
diff --git a/tests/test_lexnparse.py b/tests/test_lexnparse.py
index 7a49ba24..1f8f7465 100644
--- a/tests/test_lexnparse.py
+++ b/tests/test_lexnparse.py
@@ -27,7 +27,7 @@ else:
 
 @pytest.mark.lexnparse
 @pytest.mark.tokenstream
-class TestTokenStream():
+class TestTokenStream(object):
     test_tokens = [Token(1, TOKEN_BLOCK_BEGIN, ''),
                    Token(2, TOKEN_BLOCK_END, ''),
                    ]
@@ -55,7 +55,7 @@ class TestTokenStream():
 
 @pytest.mark.lexnparse
 @pytest.mark.lexer
-class TestLexer():
+class TestLexer(object):
 
     def test_raw1(self, env):
         tmpl = env.from_string(
@@ -129,7 +129,7 @@ class TestLexer():
 
 @pytest.mark.lexnparse
 @pytest.mark.parser
-class TestParser():
+class TestParser(object):
 
     def test_php_syntax(self, env):
         env = Environment('<?', '?>', '<?=', '?>', '<!--', '-->')
@@ -246,7 +246,7 @@ and bar comment #}
 
 @pytest.mark.lexnparse
 @pytest.mark.syntax
-class TestSyntax():
+class TestSyntax(object):
 
     def test_call(self, env):
         env = Environment()
@@ -442,7 +442,7 @@ class TestSyntax():
 
 @pytest.mark.lexnparse
 @pytest.mark.lstripblocks
-class TestLstripBlocks():
+class TestLstripBlocks(object):
 
     def test_lstrip(self, env):
         env = Environment(lstrip_blocks=True, trim_blocks=False)
diff --git a/tests/test_loader.py b/tests/test_loader.py
index b916b911..f4ac2558 100644
--- a/tests/test_loader.py
+++ b/tests/test_loader.py
@@ -22,7 +22,7 @@ from jinja2.exceptions import TemplateNotFound
 
 
 @pytest.mark.loaders
-class TestLoaders():
+class TestLoaders(object):
 
     def test_dict_loader(self, dict_loader):
         env = Environment(loader=dict_loader)
@@ -121,7 +121,7 @@ class TestLoaders():
 
 @pytest.mark.loaders
 @pytest.mark.moduleloader
-class TestModuleLoader():
+class TestModuleLoader(object):
     archive = None
 
     def compile_down(self, prefix_loader, zip='deflated', py_compile=False):
diff --git a/tests/test_regression.py b/tests/test_regression.py
index 644b15f5..adc651e9 100644
--- a/tests/test_regression.py
+++ b/tests/test_regression.py
@@ -17,7 +17,7 @@ from jinja2._compat import text_type
 
 
 @pytest.mark.regression
-class TestCorner():
+class TestCorner(object):
 
     def test_assigned_scoping(self, env):
         t = env.from_string('''
@@ -78,7 +78,7 @@ class TestCorner():
 
 
 @pytest.mark.regression
-class TestBug():
+class TestBug(object):
 
     def test_keyword_folding(self, env):
         env = Environment()
diff --git a/tests/test_security.py b/tests/test_security.py
index f0edd881..33d204c8 100644
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@ -42,7 +42,7 @@ class PublicStuff(object):
 
 
 @pytest.mark.sandbox
-class TestSandbox():
+class TestSandbox(object):
 
     def test_unsafe(self, env):
         env = SandboxedEnvironment()
diff --git a/tests/test_tests.py b/tests/test_tests.py
index 54d87bb4..a606f1ec 100644
--- a/tests/test_tests.py
+++ b/tests/test_tests.py
@@ -14,7 +14,7 @@ from jinja2 import Markup, Environment
 
 
 @pytest.mark.test_tests
-class TestTestsCase():
+class TestTestsCase(object):
 
     def test_defined(self, env):
         tmpl = env.from_string('{{ missing is defined }}|'
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 95cf0435..0775a960 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -19,7 +19,7 @@ from jinja2.utils import LRUCache, escape, object_type_repr, urlize
 
 @pytest.mark.utils
 @pytest.mark.lrucache
-class TestLRUCache():
+class TestLRUCache(object):
 
     def test_simple(self):
         d = LRUCache(3)
@@ -46,7 +46,7 @@ class TestLRUCache():
 
 @pytest.mark.utils
 @pytest.mark.helpers
-class TestHelpers():
+class TestHelpers(object):
 
     def test_object_type_repr(self):
         class X(object):
@@ -62,7 +62,7 @@ class TestHelpers():
 @pytest.mark.markupleak
 @pytest.mark.skipif(hasattr(escape, 'func_code'),
                     reason='this test only tests the c extension')
-class TestMarkupLeak():
+class TestMarkupLeak(object):
 
     def test_markup_leaks(self):
         counts = set()
@@ -78,7 +78,7 @@ class TestMarkupLeak():
 
 @pytest.mark.utils
 @pytest.mark.escapeUrlizeTarget
-class TestEscapeUrlizeTarget():
+class TestEscapeUrlizeTarget(object):
     def test_escape_urlize_target(self):
         url = "http://example.org"
         target = "<script>"