From cda1ce95f3b46c3392e57de182bc925c815b7d1f Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Mon, 1 Apr 2013 19:11:30 -0400 Subject: [PATCH] Roll back part of e3f89af62d because CURSE YOU UNIT TESTING FRAMEWORK --- tests/_test_tokenizer.py | 3 +-- tests/test_ctokenizer.py | 2 +- tests/test_pytokenizer.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/_test_tokenizer.py b/tests/_test_tokenizer.py index 13882aa..379b4fa 100644 --- a/tests/_test_tokenizer.py +++ b/tests/_test_tokenizer.py @@ -21,7 +21,6 @@ # SOFTWARE. from __future__ import print_function, unicode_literals -from unittest import TestCase from os import listdir, path from mwparserfromhell.compat import py3k @@ -32,7 +31,7 @@ class _TestParseError(Exception): pass -class TokenizerTestCase(TestCase): +class TokenizerTestCase(object): """A base test case for tokenizers, whose tests are loaded dynamically. Subclassed along with unittest.TestCase to form TestPyTokenizer and diff --git a/tests/test_ctokenizer.py b/tests/test_ctokenizer.py index 955b9a0..7a082e8 100644 --- a/tests/test_ctokenizer.py +++ b/tests/test_ctokenizer.py @@ -31,7 +31,7 @@ except ImportError: from ._test_tokenizer import TokenizerTestCase @unittest.skipUnless(CTokenizer, "C tokenizer not available") -class TestCTokenizer(TokenizerTestCase): +class TestCTokenizer(TokenizerTestCase, unittest.TestCase): """Test cases for the C tokenizer.""" @classmethod diff --git a/tests/test_pytokenizer.py b/tests/test_pytokenizer.py index 7b37eb3..697c7e5 100644 --- a/tests/test_pytokenizer.py +++ b/tests/test_pytokenizer.py @@ -27,7 +27,7 @@ from mwparserfromhell.parser.tokenizer import Tokenizer from ._test_tokenizer import TokenizerTestCase -class TestPyTokenizer(TokenizerTestCase): +class TestPyTokenizer(TokenizerTestCase, unittest.TestCase): """Test cases for the Python tokenizer.""" @classmethod