Skip to content
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

bpo-34605: Avoid master/slave terms #9101

Merged
merged 1 commit into from
Sep 7, 2018
Merged

bpo-34605: Avoid master/slave terms #9101

merged 1 commit into from
Sep 7, 2018

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Sep 7, 2018

  • 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

https://bugs.python.org/issue34605

* 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
@vstinner vstinner merged commit 5e92265 into python:master Sep 7, 2018
@vstinner vstinner deleted the misc_master_slave branch September 7, 2018 15:30
@@ -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
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
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
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
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

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.

@towerd

This comment has been minimized.

@gvanrossum
Copy link
Member

gvanrossum commented Sep 12, 2018 via email

@peterwilli

This comment has been minimized.

@noizex

This comment has been minimized.

@GuacheSuede

This comment has been minimized.

@LudwikJaniuk

This comment has been minimized.

@mkubasz

This comment has been minimized.

@fskaeh

This comment has been minimized.

@tpruzina

This comment has been minimized.

@PetteriAimonen

This comment has been minimized.

@Phvli

This comment has been minimized.

@x1024

This comment has been minimized.

@python python locked as off-topic and limited conversation to collaborators Sep 12, 2018
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

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

LGTM. Just few side comments.

@@ -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
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.

@@ -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
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.

ChrisMcKee referenced this pull request Sep 20, 2018
In distutils.command.install, replace "pliant children" (previously,
it was "pliant slaves") with "helpers".

<!-- issue-number: [bpo-34605](https://www.bugs.python.org/issue34605) -->
https://bugs.python.org/issue34605
<!-- /issue-number -->
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.