summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib')
-rw-r--r--Lib/distutils/command/install.py2
-rw-r--r--Lib/optparse.py2
-rw-r--r--Lib/sre_parse.py2
-rw-r--r--Lib/test/test_ssl.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 0258d3de..41bf4bb 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -223,7 +223,7 @@ class install(Command):
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
diff --git a/Lib/optparse.py b/Lib/optparse.py
index e8ac1e1..1c450c6 100644
--- a/Lib/optparse.py
+++ b/Lib/optparse.py
@@ -929,7 +929,7 @@ class OptionContainer:
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
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index 7a172ff..f414402 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -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 = {}
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 2cb4ad4..e120a2f 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -3494,7 +3494,7 @@ class ThreadedTests(unittest.TestCase):
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: