mirror of
https://github.com/python/cpython.git
synced 2025-10-09 16:34:44 +00:00
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
This commit is contained in:
parent
012f5b968a
commit
5e922658fb
7 changed files with 7 additions and 7 deletions
|
@ -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.
|
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
|
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
|
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
|
.. versionadded:: 3.7
|
||||||
|
|
||||||
|
|
|
@ -435,7 +435,7 @@ process which created it.
|
||||||
|
|
||||||
(If you try this it will actually output three full tracebacks
|
(If you try this it will actually output three full tracebacks
|
||||||
interleaved in a semi-random fashion, and then you may have to
|
interleaved in a semi-random fashion, and then you may have to
|
||||||
stop the master process somehow.)
|
stop the parent process somehow.)
|
||||||
|
|
||||||
|
|
||||||
Reference
|
Reference
|
||||||
|
|
|
@ -223,7 +223,7 @@ class install(Command):
|
||||||
|
|
||||||
def finalize_options(self):
|
def finalize_options(self):
|
||||||
"""Finalizes options."""
|
"""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
|
# 'finalize_other()', and 'select_scheme()') is where the default
|
||||||
# installation directories for modules, extension modules, and
|
# installation directories for modules, extension modules, and
|
||||||
# anything else we care to install from a Python module
|
# anything else we care to install from a Python module
|
||||||
|
|
|
@ -929,7 +929,7 @@ class OptionContainer:
|
||||||
self.set_description(description)
|
self.set_description(description)
|
||||||
|
|
||||||
def _create_option_mappings(self):
|
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
|
# option mappings used by this OptionParser and all
|
||||||
# OptionGroups that it owns.
|
# OptionGroups that it owns.
|
||||||
self._short_opt = {} # single letter -> Option instance
|
self._short_opt = {} # single letter -> Option instance
|
||||||
|
|
|
@ -72,7 +72,7 @@ class Verbose(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
class Pattern:
|
class Pattern:
|
||||||
# master pattern object. keeps track of global attributes
|
# main pattern object. keeps track of global attributes
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.flags = 0
|
self.flags = 0
|
||||||
self.groupdict = {}
|
self.groupdict = {}
|
||||||
|
|
|
@ -3494,7 +3494,7 @@ class ThreadedTests(unittest.TestCase):
|
||||||
client_context, server_context, hostname = testing_context()
|
client_context, server_context, hostname = testing_context()
|
||||||
# OpenSSL enables all TLS 1.3 ciphers, enforce TLS 1.2 for test
|
# OpenSSL enables all TLS 1.3 ciphers, enforce TLS 1.2 for test
|
||||||
client_context.options |= ssl.OP_NO_TLSv1_3
|
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")
|
client_context.set_ciphers("AES128")
|
||||||
server_context.set_ciphers("AES256")
|
server_context.set_ciphers("AES256")
|
||||||
with ThreadedEchoServer(context=server_context) as server:
|
with ThreadedEchoServer(context=server_context) as server:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
This directory contains a number of Python programs that are useful
|
This directory contains a number of Python programs that are useful
|
||||||
while building or extending Python.
|
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. (*)
|
ccbench A Python threads-based concurrency benchmark. (*)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue