diff options
Diffstat (limited to 'Lib/test/test_pow.py')
| -rw-r--r-- | Lib/test/test_pow.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Lib/test/test_pow.py b/Lib/test/test_pow.py index 1ee67bc452f..20b10663a2e 100644 --- a/Lib/test/test_pow.py +++ b/Lib/test/test_pow.py @@ -1,4 +1,4 @@ -import test.test_support, unittest +import test.support, unittest class PowTest(unittest.TestCase): @@ -14,18 +14,18 @@ class PowTest(unittest.TestCase): self.assertEqual(pow(type(i), 3), i*i*i) pow2 = 1 - for i in range(0,31): + for i in range(0, 31): self.assertEqual(pow(2, i), pow2) if i != 30 : pow2 = pow2*2 - for othertype in int, long: - for i in range(-10, 0) + range(1, 10): + for othertype in (int,): + for i in list(range(-10, 0)) + list(range(1, 10)): ii = type(i) for j in range(1, 11): jj = -othertype(j) pow(ii, jj) - for othertype in int, long, float: + for othertype in int, float: for i in range(1, 100): zero = type(0) exp = -othertype(i/10.0) @@ -42,7 +42,7 @@ class PowTest(unittest.TestCase): asseq = self.assertAlmostEqual elif type == int: jl = 0 - elif type == long: + elif type == int: jl, jh = 0, 15 for i in range(il, ih+1): for j in range(jl, jh+1): @@ -60,7 +60,7 @@ class PowTest(unittest.TestCase): self.powtest(int) def test_powlong(self): - self.powtest(long) + self.powtest(int) def test_powfloat(self): self.powtest(float) @@ -74,12 +74,12 @@ class PowTest(unittest.TestCase): self.assertEqual(pow(-3,3) % -8, pow(-3,3,-8)) self.assertEqual(pow(5,2) % -8, pow(5,2,-8)) - self.assertEqual(pow(3L,3L) % 8, pow(3L,3L,8)) - self.assertEqual(pow(3L,3L) % -8, pow(3L,3L,-8)) - self.assertEqual(pow(3L,2) % -2, pow(3L,2,-2)) - self.assertEqual(pow(-3L,3L) % 8, pow(-3L,3L,8)) - self.assertEqual(pow(-3L,3L) % -8, pow(-3L,3L,-8)) - self.assertEqual(pow(5L,2) % -8, pow(5L,2,-8)) + self.assertEqual(pow(3,3) % 8, pow(3,3,8)) + self.assertEqual(pow(3,3) % -8, pow(3,3,-8)) + self.assertEqual(pow(3,2) % -2, pow(3,2,-2)) + self.assertEqual(pow(-3,3) % 8, pow(-3,3,8)) + self.assertEqual(pow(-3,3) % -8, pow(-3,3,-8)) + self.assertEqual(pow(5,2) % -8, pow(5,2,-8)) for i in range(-10, 11): for j in range(0, 6): @@ -91,8 +91,8 @@ class PowTest(unittest.TestCase): ) if j >= 0 and k != 0: self.assertEqual( - pow(long(i),j) % k, - pow(long(i),j,k) + pow(int(i),j) % k, + pow(int(i),j,k) ) def test_bug643260(self): @@ -123,7 +123,7 @@ class PowTest(unittest.TestCase): eq(expected, 1.0) # else we didn't push fiveto to evenness def test_main(): - test.test_support.run_unittest(PowTest) + test.support.run_unittest(PowTest) if __name__ == "__main__": test_main() |