diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-09-07 15:30:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 15:30:33 (GMT) |
| commit | 5e922658fb55734bf8b4c6246033ea93af172ff7 (patch) | |
| tree | b83f43142e5f66a389b5c611fbc7ea164ba6bcaa /Lib | |
| parent | 012f5b968a738b15ae9b40c499a1c0778b0615a9 (diff) | |
| download | cpython-5e922658fb55734bf8b4c6246033ea93af172ff7.zip cpython-5e922658fb55734bf8b4c6246033ea93af172ff7.tar.gz cpython-5e922658fb55734bf8b4c6246033ea93af172ff7.tar.bz2 | |
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
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/command/install.py | 2 | ||||
| -rw-r--r-- | Lib/optparse.py | 2 | ||||
| -rw-r--r-- | Lib/sre_parse.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_ssl.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index 0258d3de..41bf4bb 100644 --- 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 e8ac1e1..1c450c6 100644 --- 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 7a172ff..f414402 100644 --- 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 2cb4ad4..e120a2f 100644 --- 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: |