bpo-40462: fix variable and function names (GH-19832)

Automerge-Triggered-By: @vstinner

diff --git a/Lib/test/mock_socket.py b/Lib/test/mock_socket.py
index b28c4732cc3c2a64bcbdbeec167d3157e5f46db2..cda4db25cba59446aa315e78c3f6e0b92134fbb5 100644 (file)
--- a/Lib/test/mock_socket.py
+++ b/Lib/test/mock_socket.py
@@ -91,7 +91,7 @@ class MockSocket:
         handle = MockFile(self.lines)
         return handle
 
-    def sendall(self, buffer, flags=None):
+    def sendall(self, data, flags=None):
         self.last = data
         self.output.append(data)
         return len(data)

diff --git a/Lib/test/test_frame.py b/Lib/test/test_frame.py
index d6aa2834cbc28b749b32f7daa412be296d5f68ca..a8696f011f9453d8991373495aa4f6093d2c634b 100644 (file)
--- a/Lib/test/test_frame.py
+++ b/Lib/test/test_frame.py
@@ -50,7 +50,7 @@ class ClearTest(unittest.TestCase):
             nonlocal endly
             try:
                 yield
-                inner()
+                self.inner()
             finally:
                 endly = True
         gen = g()

diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py
index 4a62ae1b11306ecc843f34add0ae265d147529c1..eef82ff937ab7c038ad01622fd996e02c6dbdd39 100644 (file)
--- a/Lib/unittest/test/test_program.py
+++ b/Lib/unittest/test/test_program.py
@@ -188,8 +188,6 @@ class TestCommandLineArgs(unittest.TestCase):
         program = self.program
         for arg, attr in (('buffer', 'buffer'), ('failfast', 'failfast'),
                       ('catch', 'catchbreak')):
-            if attr == 'catch' and not hasInstallHandler:
-                continue
 
             setattr(program, attr, None)
             program.parseArgs([None])