diff options
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/support.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_ftplib.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_posix.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_sys.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_winsound.py | 8 |
5 files changed, 7 insertions, 11 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py index 014bcf5..c5640e0 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -1232,7 +1232,7 @@ def run_with_tz(tz): try: return func(*args, **kwds) finally: - if orig_tz == None: + if orig_tz is None: del os.environ['TZ'] else: os.environ['TZ'] = orig_tz diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index 7028f46..299a146 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -342,7 +342,7 @@ if ssl is not None: # http://www.mail-archive.com/openssl-users@openssl.org/msg60710.html pass self._ssl_closing = False - if getattr(self, '_ccc', False) == False: + if getattr(self, '_ccc', False) is False: super(SSLConnection, self).close() else: pass diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index 4e7a37c..f59607b 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -651,7 +651,7 @@ class PosixTester(unittest.TestCase): groups = idg.read().strip() ret = idg.close() - if ret != None or not groups: + if ret is not None or not groups: raise unittest.SkipTest("need working 'id -G'") self.assertEqual( @@ -665,7 +665,7 @@ class PosixTester(unittest.TestCase): groups = idg.read().strip() ret = idg.close() - if ret != None or not groups: + if ret is not None or not groups: raise unittest.SkipTest("need working 'id -G'") # 'id -G' and 'os.getgroups()' should return the same diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 349b1ac..a1074c3 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -897,7 +897,7 @@ class SizeofTest(unittest.TestCase): except TypeError: tb = sys.exc_info()[2] # traceback - if tb != None: + if tb is not None: check(tb, size('2P2i')) # symtable entry # XXX diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py index 34c3dea..eb7f75f 100644 --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -16,16 +16,12 @@ def has_sound(sound): try: # Ask the mixer API for the number of devices it knows about. # When there are no devices, PlaySound will fail. - if ctypes.windll.winmm.mixerGetNumDevs() is 0: + if ctypes.windll.winmm.mixerGetNumDevs() == 0: return False key = winreg.OpenKeyEx(winreg.HKEY_CURRENT_USER, "AppEvents\Schemes\Apps\.Default\{0}\.Default".format(sound)) - value = winreg.EnumValue(key, 0)[1] - if value is not "": - return True - else: - return False + return winreg.EnumValue(key, 0)[1] != "" except WindowsError: return False |