diff options
| -rw-r--r-- | Lib/ctypes/test/test_callbacks.py | 2 | ||||
| -rw-r--r-- | Lib/json/encoder.py | 2 | ||||
| -rw-r--r-- | Lib/pickletools.py | 2 | ||||
| -rw-r--r-- | Lib/test/script_helper.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_binop.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_pow.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_sys.py | 4 |
7 files changed, 9 insertions, 11 deletions
diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py index ea51c33610..36fc539bdb 100644 --- a/Lib/ctypes/test/test_callbacks.py +++ b/Lib/ctypes/test/test_callbacks.py @@ -164,7 +164,7 @@ class SampleCallbacksTestCase(unittest.TestCase): result = integrate(0.0, 1.0, CALLBACK(func), 10) diff = abs(result - 1./3.) - self.assertTrue(diff < 0.01, "%s not less than 0.01" % diff) + self.assertLess(diff, 0.01, "%s not less than 0.01" % diff) def test_issue_8959_a(self): from ctypes.util import find_library diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py index 2beb10e358..d068e72216 100644 --- a/Lib/json/encoder.py +++ b/Lib/json/encoder.py @@ -397,7 +397,7 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, yield 'true' elif o is False: yield 'false' - elif isinstance(o, (int, int)): + elif isinstance(o, int): yield str(o) elif isinstance(o, float): yield _floatstr(o) diff --git a/Lib/pickletools.py b/Lib/pickletools.py index e067d7eb01..89a8e5845a 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -733,7 +733,7 @@ pylong = StackObject( pyinteger_or_bool = StackObject( name='int_or_bool', - obtype=(int, int, bool), + obtype=(int, bool), doc="A Python integer object (short or long), or " "a Python bool.") diff --git a/Lib/test/script_helper.py b/Lib/test/script_helper.py index 39874d97ec..28d5e9d13b 100644 --- a/Lib/test/script_helper.py +++ b/Lib/test/script_helper.py @@ -79,7 +79,7 @@ def make_zip_script(zip_dir, zip_basename, script_name, name_in_zip=None): name_in_zip = os.path.basename(script_name) zip_file.write(script_name, name_in_zip) zip_file.close() - #if test.test_support.verbose: + #if test.support.verbose: # zip_file = zipfile.ZipFile(zip_name, 'r') # print 'Contents of %r:' % zip_name # zip_file.printdir() @@ -114,7 +114,7 @@ def make_zip_pkg(zip_dir, zip_basename, pkg_name, script_basename, zip_file.close() for name in unlink: os.unlink(name) - #if test.test_support.verbose: + #if test.support.verbose: # zip_file = zipfile.ZipFile(zip_name, 'r') # print 'Contents of %r:' % zip_name # zip_file.printdir() diff --git a/Lib/test/test_binop.py b/Lib/test/test_binop.py index 5f3ba8b402..84179167e2 100644 --- a/Lib/test/test_binop.py +++ b/Lib/test/test_binop.py @@ -16,7 +16,7 @@ def isint(x): def isnum(x): """Test whether an object is an instance of a built-in numeric type.""" - for T in int, int, float, complex: + for T in int, float, complex: if isinstance(x, T): return 1 return 0 diff --git a/Lib/test/test_pow.py b/Lib/test/test_pow.py index 859c3737b9..60bb5330eb 100644 --- a/Lib/test/test_pow.py +++ b/Lib/test/test_pow.py @@ -18,14 +18,14 @@ class PowTest(unittest.TestCase): self.assertEquals(pow(2, i), pow2) if i != 30 : pow2 = pow2*2 - for othertype in int, int: + 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, int, float: + for othertype in int, float: for i in range(1, 100): zero = type(0) exp = -othertype(i/10.0) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 9389254b7a..eb5d877283 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -86,7 +86,6 @@ class SysModuleTest(unittest.TestCase): # Python/pythonrun.c::PyErr_PrintEx() is tricky. def test_exit(self): - import subprocess self.assertRaises(TypeError, sys.exit, 42, 42) @@ -529,7 +528,6 @@ class SysModuleTest(unittest.TestCase): sys._clear_type_cache() def test_ioencoding(self): - import subprocess env = dict(os.environ) # Test character: cent sign, encoded as 0x4A (ASCII J) in CP424, @@ -551,7 +549,7 @@ class SysModuleTest(unittest.TestCase): # Issue #7774: Ensure that sys.executable is an empty string if argv[0] # has been set to an non existent program name and Python is unable to # retrieve the real program name - import subprocess + # For a normal installation, it should work without 'cwd' # argument. For test runs in the build directory, see #7774. python_dir = os.path.dirname(os.path.realpath(sys.executable)) |