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

diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst
index 153d8fb70456238dcd523d5095bfc07d6bdf9cd4..722a0e804314b45a8302ff78fbbc0db34a4ba32c 100644 (file)
--- a/Doc/library/gc.rst
+++ b/Doc/library/gc.rst
@@ -181,7 +181,7 @@ The :mod:`gc` module provides the following functions:
    fork() call to make the gc copy-on-write friendly or to speed up collection.
    Also collection before a POSIX fork() call may free pages for future
    allocation which can cause copy-on-write too so it's advised to disable gc
-   in master process and freeze before fork and enable gc in child process.
+   in parent process and freeze before fork and enable gc in child process.
 
    .. versionadded:: 3.7
 

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 504f3a1c3c33bf8f435b2a99d135548b8e42fdbb..a7d26f9b4554d7aec9d4173488a67051d7c962f6 100644 (file)
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -435,7 +435,7 @@ process which created it.
 
    (If you try this it will actually output three full tracebacks
    interleaved in a semi-random fashion, and then you may have to
-   stop the master process somehow.)
+   stop the parent process somehow.)
 
 
 Reference

diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 0258d3deae9467988c42aa71e7750f4b9d526583..41bf4bb9fb22f0e22cf57a429b3e87d772aab8d6 100644 (file)
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -223,7 +223,7 @@ class install(Command):
 
     def finalize_options(self):
         """Finalizes options."""
-        # This method (and its pliant slaves, like 'finalize_unix()',
+        # This method (and its pliant childs, like 'finalize_unix()',
         # 'finalize_other()', and 'select_scheme()') is where the default
         # installation directories for modules, extension modules, and
         # anything else we care to install from a Python module

diff --git a/Lib/optparse.py b/Lib/optparse.py
index e8ac1e156a2b29c1e8dd686219a581c4adced6f6..1c450c6fcbe3b62b2247c2fb25a8112f6abca6f6 100644 (file)
--- a/Lib/optparse.py
+++ b/Lib/optparse.py
@@ -929,7 +929,7 @@ class OptionContainer:
         self.set_description(description)
 
     def _create_option_mappings(self):
-        # For use by OptionParser constructor -- create the master
+        # For use by OptionParser constructor -- create the main
         # option mappings used by this OptionParser and all
         # OptionGroups that it owns.
         self._short_opt = {}            # single letter -> Option instance

diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index 7a172ff2fb14d5a0b245d12eb5370d5f7ccbffe4..f414402f93799d741417192a7ae54428dfc0a723 100644 (file)
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -72,7 +72,7 @@ class Verbose(Exception):
     pass
 
 class Pattern:
-    # master pattern object.  keeps track of global attributes
+    # main pattern object.  keeps track of global attributes
     def __init__(self):
         self.flags = 0
         self.groupdict = {}

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 2cb4ad4a36d4158668cfced55ca2a9d0eea4ba16..e120a2f9adf22e3e7f97f6b13c479170a050d1ce 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -3494,7 +3494,7 @@ class ThreadedTests(unittest.TestCase):
         client_context, server_context, hostname = testing_context()
         # OpenSSL enables all TLS 1.3 ciphers, enforce TLS 1.2 for test
         client_context.options |= ssl.OP_NO_TLSv1_3
-        # Force different suites on client and master
+        # Force different suites on client and server
         client_context.set_ciphers("AES128")
         server_context.set_ciphers("AES256")
         with ThreadedEchoServer(context=server_context) as server:

diff --git a/Tools/README b/Tools/README
index 35528811fee9fd9a58da9c9fb5926a1011bc8cad..6c5fb20818120d5fa74c9bd1ddd47dc5ee4032ea 100644 (file)
--- a/Tools/README
+++ b/Tools/README
@@ -1,7 +1,7 @@
 This directory contains a number of Python programs that are useful
 while building or extending Python.
 
-buildbot        Batchfiles for running on Windows buildslaves.
+buildbot        Batchfiles for running on Windows buildbot workers.
 
 ccbench         A Python threads-based concurrency benchmark. (*)