Skip to content

Commit 5e92265

Browse files
authored
bpo-34605: Avoid master/slave terms (GH-9101)
* Replace "master process" with "parent process" * Replace "master option mappings" with "main option mappings" * Replace "master pattern object" with "main pattern object" * ssl: replace "master" with "server" * And some other similar changes
1 parent 012f5b9 commit 5e92265

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

Doc/library/gc.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ The :mod:`gc` module provides the following functions:
181181
fork() call to make the gc copy-on-write friendly or to speed up collection.
182182
Also collection before a POSIX fork() call may free pages for future
183183
allocation which can cause copy-on-write too so it's advised to disable gc
184-
in master process and freeze before fork and enable gc in child process.
184+
in parent process and freeze before fork and enable gc in child process.
185185

186186
.. versionadded:: 3.7
187187

Doc/library/multiprocessing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ process which created it.
435435

436436
(If you try this it will actually output three full tracebacks
437437
interleaved in a semi-random fashion, and then you may have to
438-
stop the master process somehow.)
438+
stop the parent process somehow.)
439439

440440

441441
Reference

Lib/distutils/command/install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def initialize_options(self):
223223

224224
def finalize_options(self):
225225
"""Finalizes options."""
226-
# This method (and its pliant slaves, like 'finalize_unix()',
226+
# This method (and its pliant childs, like 'finalize_unix()',
227227
# 'finalize_other()', and 'select_scheme()') is where the default
228228
# installation directories for modules, extension modules, and
229229
# anything else we care to install from a Python module

Lib/optparse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ def __init__(self, option_class, conflict_handler, description):
929929
self.set_description(description)
930930

931931
def _create_option_mappings(self):
932-
# For use by OptionParser constructor -- create the master
932+
# For use by OptionParser constructor -- create the main
933933
# option mappings used by this OptionParser and all
934934
# OptionGroups that it owns.
935935
self._short_opt = {} # single letter -> Option instance

Lib/sre_parse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Verbose(Exception):
7272
pass
7373

7474
class Pattern:
75-
# master pattern object. keeps track of global attributes
75+
# main pattern object. keeps track of global attributes
7676
def __init__(self):
7777
self.flags = 0
7878
self.groupdict = {}

Lib/test/test_ssl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3494,7 +3494,7 @@ def test_no_shared_ciphers(self):
34943494
client_context, server_context, hostname = testing_context()
34953495
# OpenSSL enables all TLS 1.3 ciphers, enforce TLS 1.2 for test
34963496
client_context.options |= ssl.OP_NO_TLSv1_3
3497-
# Force different suites on client and master
3497+
# Force different suites on client and server
34983498
client_context.set_ciphers("AES128")
34993499
server_context.set_ciphers("AES256")
35003500
with ThreadedEchoServer(context=server_context) as server:

Tools/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
This directory contains a number of Python programs that are useful
22
while building or extending Python.
33

4-
buildbot Batchfiles for running on Windows buildslaves.
4+
buildbot Batchfiles for running on Windows buildbot workers.
55

66
ccbench A Python threads-based concurrency benchmark. (*)
77

0 commit comments

Comments
 (0)