summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-09 15:16:03 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-10-09 15:16:03 (GMT)
commitb29614e047110f4d9af993a6cdec4e3fb7ef9738 (patch)
treea15a5ac7b508c5033f640123f498a322f44b04ce /Lib/test
parenta5119351519926971240f61d0c23a5fc5d00743e (diff)
downloadcpython-b29614e047110f4d9af993a6cdec4e3fb7ef9738.zip
cpython-b29614e047110f4d9af993a6cdec4e3fb7ef9738.tar.gz
cpython-b29614e047110f4d9af993a6cdec4e3fb7ef9738.tar.bz2
compare singletons by identity not equality (closes #16712)
Patch from Serhiy Storchaka.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/support.py2
-rw-r--r--Lib/test/test_ftplib.py2
-rw-r--r--Lib/test/test_posix.py4
-rw-r--r--Lib/test/test_sys.py2
4 files changed, 5 insertions, 5 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 6e0c6ee..e5ec85c 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