-
-
Notifications
You must be signed in to change notification settings - Fork 34.5k
bpo-34605: Avoid master/slave terms #9101
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
* 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
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 = {} | ||
|
|
||
| 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. | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. (*) | ||
|
|
||
|
|
||
There was a problem hiding this comment.
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. Althoughpliantisn't a very common word, and I'm not sure how it's being used here.There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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".
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.