diff -r 71fb426ee972 Lib/test/test_array.py --- a/Lib/test/test_array.py Mon Jan 07 23:16:49 2013 +0200 +++ b/Lib/test/test_array.py Mon Jan 07 16:40:59 2013 -0600 @@ -177,7 +177,7 @@ tests.append(ArrayReconstructorTest) -class BaseTest(unittest.TestCase): +class BaseTest: # Required class attributes (provided by subclasses # typecode: the typecode to test # example: an initializer usable in the constructor for this type @@ -1036,7 +1036,7 @@ a = array.array(self.typecode, self.example) self.assertRaises(TypeError, a.__setitem__, 0, self.example[:2]) -class UnicodeTest(StringTest): +class UnicodeTest(StringTest, unittest.TestCase): typecode = 'u' example = '\x01\u263a\x00\ufeff' smallerexample = '\x01\u263a\x00\ufefe' @@ -1216,54 +1216,54 @@ ) -class ByteTest(SignedNumberTest): +class ByteTest(SignedNumberTest, unittest.TestCase): typecode = 'b' minitemsize = 1 tests.append(ByteTest) -class UnsignedByteTest(UnsignedNumberTest): +class UnsignedByteTest(UnsignedNumberTest, unittest.TestCase): typecode = 'B' minitemsize = 1 tests.append(UnsignedByteTest) -class ShortTest(SignedNumberTest): +class ShortTest(SignedNumberTest, unittest.TestCase): typecode = 'h' minitemsize = 2 tests.append(ShortTest) -class UnsignedShortTest(UnsignedNumberTest): +class UnsignedShortTest(UnsignedNumberTest, unittest.TestCase): typecode = 'H' minitemsize = 2 tests.append(UnsignedShortTest) -class IntTest(SignedNumberTest): +class IntTest(SignedNumberTest, unittest.TestCase): typecode = 'i' minitemsize = 2 tests.append(IntTest) -class UnsignedIntTest(UnsignedNumberTest): +class UnsignedIntTest(UnsignedNumberTest, unittest.TestCase): typecode = 'I' minitemsize = 2 tests.append(UnsignedIntTest) -class LongTest(SignedNumberTest): +class LongTest(SignedNumberTest, unittest.TestCase): typecode = 'l' minitemsize = 4 tests.append(LongTest) -class UnsignedLongTest(UnsignedNumberTest): +class UnsignedLongTest(UnsignedNumberTest, unittest.TestCase): typecode = 'L' minitemsize = 4 tests.append(UnsignedLongTest) @unittest.skipIf(not have_long_long, 'need long long support') -class LongLongTest(SignedNumberTest): +class LongLongTest(SignedNumberTest, unittest.TestCase): typecode = 'q' minitemsize = 8 tests.append(LongLongTest) @unittest.skipIf(not have_long_long, 'need long long support') -class UnsignedLongLongTest(UnsignedNumberTest): +class UnsignedLongLongTest(UnsignedNumberTest, unittest.TestCase): typecode = 'Q' minitemsize = 8 tests.append(UnsignedLongLongTest) @@ -1293,12 +1293,12 @@ b.byteswap() self.assertEqual(a, b) -class FloatTest(FPTest): +class FloatTest(FPTest, unittest.TestCase): typecode = 'f' minitemsize = 4 tests.append(FloatTest) -class DoubleTest(FPTest): +class DoubleTest(FPTest, unittest.TestCase): typecode = 'd' minitemsize = 8