Permalink
Browse files

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
  • Loading branch information...
vstinner committed Sep 7, 2018
1 parent 012f5b9 commit 5e922658fb55734bf8b4c6246033ea93af172ff7
Showing with 7 additions and 7 deletions.
  1. +1 −1 Doc/library/gc.rst
  2. +1 −1 Doc/library/multiprocessing.rst
  3. +1 −1 Lib/distutils/command/install.py
  4. +1 −1 Lib/optparse.py
  5. +1 −1 Lib/sre_parse.py
  6. +1 −1 Lib/test/test_ssl.py
  7. +1 −1 Tools/README
View
@@ -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
@@ -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
@@ -223,7 +223,7 @@ def initialize_options(self):
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
View
@@ -929,7 +929,7 @@ def __init__(self, option_class, conflict_handler, description):
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
View
@@ -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 = {}
View
@@ -3494,7 +3494,7 @@ def test_no_shared_ciphers(self):
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:
View
@@ -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. (*)

1 comment on commit 5e92265

@Jacob-Bass

This comment was marked as disruptive content.

Show comment
Hide comment
@Jacob-Bass

Jacob-Bass Sep 14, 2018

This pc culture bullshit is getting out of hand...

Jacob-Bass commented on 5e92265 Sep 14, 2018

This pc culture bullshit is getting out of hand...

Please sign in to comment.