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 b28c473..cda4db2 100644
--- a/Lib/test/mock_socket.py
+++ b/Lib/test/mock_socket.py
@@ -91,7 +91,7 @@
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 d6aa283..a8696f0 100644
--- a/Lib/test/test_frame.py
+++ b/Lib/test/test_frame.py
@@ -50,7 +50,7 @@
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 4a62ae1..eef82ff 100644
--- a/Lib/unittest/test/test_program.py
+++ b/Lib/unittest/test/test_program.py
@@ -188,8 +188,6 @@
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])