From: Furkan Önder <furkantahaonder@gmail.com>
Date: Fri, 1 May 2020 12:49:35 +0000 (+0300)
Subject: bpo-40462: fix variable and function names (GH-19832)
X-Git-Tag: v3.9.0b1~223
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=719e14d2837520c18398a3e22a36f20c1fe76edf;p=thirdparty%2FPython%2Fcpython.git

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 b28c4732cc3c..cda4db25cba5 100644
--- 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 d6aa2834cbc2..a8696f011f94 100644
--- 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 4a62ae1b1130..eef82ff937ab 100644
--- 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])