From 3c65457156d87e55010507d616b4eecb7a02883d Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Tue, 31 Aug 2021 16:59:52 +0300 Subject: [PATCH] bpo-45060: Get rid of few uses of the equality operators with None (GH-28087) --- Doc/library/dbm.rst | 2 +- Lib/ctypes/_aix.py | 4 ++-- Lib/email/contentmanager.py | 2 +- Lib/test/datetimetester.py | 2 +- Lib/test/test_pty.py | 2 +- Lib/test/test_type_annotations.py | 2 +- Modules/_gdbmmodule.c | 4 ++-- Modules/clinic/_gdbmmodule.c.h | 4 ++-- Tools/clinic/clinic.py | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst index 57ae547b833..ff01ae90f64 100644 --- a/Doc/library/dbm.rst +++ b/Doc/library/dbm.rst @@ -216,7 +216,7 @@ supported. contains them all:: k = db.firstkey() - while k != None: + while k is not None: print(k) k = db.nextkey(k) diff --git a/Lib/ctypes/_aix.py b/Lib/ctypes/_aix.py index 190cac6507e..26959d90a4d 100644 --- a/Lib/ctypes/_aix.py +++ b/Lib/ctypes/_aix.py @@ -282,7 +282,7 @@ def find_shared(paths, name): if path.exists(archive): members = get_shared(get_ld_headers(archive)) member = get_member(re.escape(name), members) - if member != None: + if member is not None: return (base, member) else: return (None, None) @@ -307,7 +307,7 @@ def find_library(name): libpaths = get_libpaths() (base, member) = find_shared(libpaths, name) - if base != None: + if base is not None: return f"{base}({member})" # To get here, a member in an archive has not been found diff --git a/Lib/email/contentmanager.py b/Lib/email/contentmanager.py index 3cf62dc8621..fcf278dbccb 100644 --- a/Lib/email/contentmanager.py +++ b/Lib/email/contentmanager.py @@ -144,7 +144,7 @@ def _encode_text(string, charset, cte, policy): linesep = policy.linesep.encode('ascii') def embedded_body(lines): return linesep.join(lines) + linesep def normal_body(lines): return b'\n'.join(lines) + b'\n' - if cte==None: + if cte is None: # Use heuristics to decide on the "best" encoding. if max((len(x) for x in lines), default=0) <= policy.max_line_length: try: diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 316cf0b8da7..6414f1ace3f 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -344,7 +344,7 @@ class TestTimeZone(unittest.TestCase): with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO) self.assertIn(timezone(ZERO), {timezone(ZERO)}) self.assertTrue(timezone(ZERO) != None) - self.assertFalse(timezone(ZERO) == None) + self.assertFalse(timezone(ZERO) == None) tz = timezone(ZERO) self.assertTrue(tz == ALWAYS_EQ) diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index e2e9475b5d3..0c178127571 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -136,7 +136,7 @@ class PtyTest(unittest.TestCase): mode = None new_stdin_winsz = None - if self.stdin_rows != None and self.stdin_cols != None: + if self.stdin_rows is not None and self.stdin_cols is not None: try: # Modify pty.STDIN_FILENO window size; we need to # check if pty.openpty() is able to set pty slave diff --git a/Lib/test/test_type_annotations.py b/Lib/test/test_type_annotations.py index f6c99bda3aa..87f46c2ce8c 100644 --- a/Lib/test/test_type_annotations.py +++ b/Lib/test/test_type_annotations.py @@ -71,7 +71,7 @@ class TypeAnnotationTests(unittest.TestCase): @__annotations__.deleter def __annotations__(self): - if hasattr(self, 'my_annotations') and self.my_annotations == None: + if getattr(self, 'my_annotations', False) is None: raise AttributeError('__annotations__') self.my_annotations = None diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c index 8a8c6e78259..3c9a0e98e47 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -450,7 +450,7 @@ The following code prints every key in the database db, without having to create a list in memory that contains them all: k = db.firstkey() - while k != None: + while k is not None: print(k) k = db.nextkey(k) [clinic start generated code]*/ @@ -458,7 +458,7 @@ to create a list in memory that contains them all: static PyObject * _gdbm_gdbm_nextkey_impl(gdbmobject *self, PyTypeObject *cls, const char *key, Py_ssize_t key_length) -/*[clinic end generated code: output=c81a69300ef41766 input=fcf6a51a96ce0172]*/ +/*[clinic end generated code: output=c81a69300ef41766 input=365e297bc0b3db48]*/ { PyObject *v; datum dbm_key, nextkey; diff --git a/Modules/clinic/_gdbmmodule.c.h b/Modules/clinic/_gdbmmodule.c.h index 06044517770..15baf52f60d 100644 --- a/Modules/clinic/_gdbmmodule.c.h +++ b/Modules/clinic/_gdbmmodule.c.h @@ -161,7 +161,7 @@ PyDoc_STRVAR(_gdbm_gdbm_nextkey__doc__, "to create a list in memory that contains them all:\n" "\n" " k = db.firstkey()\n" -" while k != None:\n" +" while k is not None:\n" " print(k)\n" " k = db.nextkey(k)"); @@ -340,4 +340,4 @@ skip_optional: exit: return return_value; } -/*[clinic end generated code: output=c3ee3ad64a2f331f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1fed9ed50ad23551 input=a9049054013a1b77]*/ diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index b5a884536a9..d6a820d8281 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -1691,7 +1691,7 @@ class BlockPrinter: dsl_name = block.dsl_name write = self.f.write - assert not ((dsl_name == None) ^ (output == None)), "you must specify dsl_name and output together, dsl_name " + repr(dsl_name) + assert not ((dsl_name is None) ^ (output is None)), "you must specify dsl_name and output together, dsl_name " + repr(dsl_name) if not dsl_name: write(input) @@ -3003,7 +3003,7 @@ class int_converter(CConverter): self.format_unit = 'C' elif accept != {int}: fail("int_converter: illegal 'accept' argument " + repr(accept)) - if type != None: + if type is not None: self.type = type def parse_arg(self, argname, displayname):