compare singletons by identity not equality (closes #16712)

benjaminp · benjaminp · commit b29614e04711 · 2012-10-09T11:16:03.000-04:00
Patch from Serhiy Storchaka.
diff --git a/Lib/os.py b/Lib/os.py
@@ -985,7 +985,7 @@ def popen(cmd, mode="r", buffering=-1):
         raise TypeError("invalid cmd type (%s, expected string)" % type(cmd))
     if mode not in ("r", "w"):
         raise ValueError("invalid mode %r" % mode)
-    if buffering == 0 or buffering == None:
+    if buffering == 0 or buffering is None:
         raise ValueError("popen() does not support unbuffered streams")
     import subprocess, io
     if mode == "r":
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
@@ -2551,8 +2551,8 @@ class BadUsage(Exception): pass
             if opt == '-w':
                 writing = True
 
-        if start_server == True:
-            if port == None:
+        if start_server:
+            if port is None:
                 port = 0
             browse(port, open_browser=open_browser)
             return
diff --git a/Lib/test/support.py b/Lib/test/support.py
@@ -1232,7 +1232,7 @@ def inner(*args, **kwds):
             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
@@ -342,7 +342,7 @@ def _do_ssl_shutdown(self):
                 # 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
@@ -651,7 +651,7 @@ def test_getgrouplist(self):
             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 @@ def test_getgroups(self):
             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
@@ -897,7 +897,7 @@ def test_pythontypes(self):
         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/unittest/case.py b/Lib/unittest/case.py
@@ -736,7 +736,7 @@ def assertSequenceEqual(self, seq1, seq2, msg=None, seq_type=None):
             msg: Optional message to use on failure instead of a list of
                     differences.
         """
-        if seq_type != None:
+        if seq_type is not None:
             seq_type_name = seq_type.__name__
             if not isinstance(seq1, seq_type):
                 raise self.failureException('First sequence is not a %s: %s'
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
@@ -1332,7 +1332,7 @@ def pretty_printer_lookup(gdbval):
   /usr/lib/debug/usr/lib/libpython2.6.so.1.0.debug-gdb.py
 """
 def register (obj):
-    if obj == None:
+    if obj is None:
         obj = gdb
 
     # Wire up the pretty-printer
diff --git a/Tools/scripts/texi2html.py b/Tools/scripts/texi2html.py
@@ -319,7 +319,7 @@ def parserest(self, fp, initial_lineno):
 
     # Start saving text in a buffer instead of writing it to a file
     def startsaving(self):
-        if self.savetext != None:
+        if self.savetext is not None:
             self.savestack.append(self.savetext)
             # print '*** Recursively saving text, expect trouble'
         self.savetext = ''
@@ -341,7 +341,7 @@ def write(self, *args):
         except:
             print(args)
             raise TypeError
-        if self.savetext != None:
+        if self.savetext is not None:
             self.savetext = self.savetext + text
         elif self.nodefp:
             self.nodefp.write(text)
@@ -350,7 +350,7 @@ def write(self, *args):
 
     # Complete the current node -- write footnotes and close file
     def endnode(self):
-        if self.savetext != None:
+        if self.savetext is not None:
             print('*** Still saving text at end of node')
             dummy = self.collectsavings()
         if self.footnotes:
@@ -804,7 +804,7 @@ def open_i(self): self.write('<I>')
     def close_i(self): self.write('</I>')
 
     def open_footnote(self):
-        # if self.savetext <> None:
+        # if self.savetext is not None:
         #       print '*** Recursive footnote -- expect weirdness'
         id = len(self.footnotes) + 1
         self.write(self.FN_SOURCE_PATTERN % {'id': repr(id)})
@@ -1442,7 +1442,7 @@ def do_item(self, args):
             else:
                 # some other character, e.g. '-'
                 args = self.itemarg + ' ' + args
-        if self.itemnumber != None:
+        if self.itemnumber is not None:
             args = self.itemnumber + '. ' + args
             self.itemnumber = increment(self.itemnumber)
         if self.stack and self.stack[-1] == 'table':
