Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bpo-34605: Avoid master/slave terms
* 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
commit 2cdeced797251f218e416c04b31a00ebbac392d3
2 changes: 1 addition & 1 deletion Doc/library/gc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Doc/library/multiprocessing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Lib/distutils/command/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()',
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this reads better as children. Although pliant isn't a very common word, and I'm not sure how it's being used here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, maybe I should have waited longer before merging this one :-( I'm wasn't 100% sure between "childs" and "children". Sorry, english is not my first language. I created PR #9102 to replace childs with children.

I'm not sure what do you propose for pliant. In case of doubt, I leave it unchanged.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I Googled a bit and it seems "pliant slave" is an old-fashioned way to refer to slaves, and even more demeaning than just "slave" -- I presume it was meant ironically by the original author. We should really replace the entire construct "pliant slaves" with a more neutral term. I don't think "children" is the right term -- I propose "helpers".

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gvanrossum, @ericvsmith: Ok, I created #9195

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gvanrossum it's in the same vein as compliant.

# '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
Expand Down
2 changes: 1 addition & 1 deletion Lib/optparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Lib/sre_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually both wordings are wrong. This class doesn't represent a pattern object in any sense. I'll open a separate issue for this.

def __init__(self):
self.flags = 0
self.groupdict = {}
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_ssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Tools/README
Original file line number Diff line number Diff line change
@@ -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.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, "buildslave" was a term used in the Buildbot documentation: http://docs.buildbot.net/0.8.5/manual/cfg-buildslaves.html. In recent versions it was replaced with "worker": http://docs.buildbot.net/1.4.0/manual/cfg-workers.html.

buildbot Batchfiles for running on Windows buildbot workers.

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

Expand Down