diff --git a/venv/lib/python3.7/site-packages/OpenSSL/SSL.py b/venv/lib/python3.7/site-packages/OpenSSL/SSL.py index e3eddae8..ac060c77 100644 --- a/venv/lib/python3.7/site-packages/OpenSSL/SSL.py +++ b/venv/lib/python3.7/site-packages/OpenSSL/SSL.py @@ -2127,9 +2127,9 @@ def client_random(self): _lib.SSL_get_client_random(self._ssl, outp, length) return _ffi.buffer(outp, length)[:] - def master_key(self): + def main_key(self): """ - Retrieve the value of the master key for this session. + Retrieve the value of the main key for this session. :return: A string representing the state """ @@ -2137,10 +2137,10 @@ def master_key(self): if session == _ffi.NULL: return None - length = _lib.SSL_SESSION_get_master_key(session, _ffi.NULL, 0) + length = _lib.SSL_SESSION_get_main_key(session, _ffi.NULL, 0) assert length > 0 outp = _no_zero_allocator("unsigned char[]", length) - _lib.SSL_SESSION_get_master_key(session, outp, length) + _lib.SSL_SESSION_get_main_key(session, outp, length) return _ffi.buffer(outp, length)[:] def export_keying_material(self, label, olen, context=None): diff --git a/venv/lib/python3.7/site-packages/_pytest/assertion/__init__.py b/venv/lib/python3.7/site-packages/_pytest/assertion/__init__.py index b5c846c2..a1774309 100644 --- a/venv/lib/python3.7/site-packages/_pytest/assertion/__init__.py +++ b/venv/lib/python3.7/site-packages/_pytest/assertion/__init__.py @@ -93,7 +93,7 @@ def undo(): def pytest_collection(session): # this hook is only called when test modules are collected - # so for example not in the master process of pytest-xdist + # so for example not in the main process of pytest-xdist # (which does not collect test modules) assertstate = getattr(session.config, "_assertstate", None) if assertstate: diff --git a/venv/lib/python3.7/site-packages/_pytest/cacheprovider.py b/venv/lib/python3.7/site-packages/_pytest/cacheprovider.py index 87b2e542..31bd0c46 100644 --- a/venv/lib/python3.7/site-packages/_pytest/cacheprovider.py +++ b/venv/lib/python3.7/site-packages/_pytest/cacheprovider.py @@ -215,7 +215,7 @@ def pytest_collection_modifyitems(self, session, config, items): def pytest_sessionfinish(self, session): config = self.config - if config.getoption("cacheshow") or hasattr(config, "slaveinput"): + if config.getoption("cacheshow") or hasattr(config, "subordinateinput"): return saved_lastfailed = config.cache.get("cache/lastfailed", {}) @@ -251,7 +251,7 @@ def _get_increasing_order(self, items): def pytest_sessionfinish(self, session): config = self.config - if config.getoption("cacheshow") or hasattr(config, "slaveinput"): + if config.getoption("cacheshow") or hasattr(config, "subordinateinput"): return config.cache.set("cache/nodeids", self.cached_nodeids) diff --git a/venv/lib/python3.7/site-packages/_pytest/junitxml.py b/venv/lib/python3.7/site-packages/_pytest/junitxml.py index 122e0c7c..07ffc2bc 100644 --- a/venv/lib/python3.7/site-packages/_pytest/junitxml.py +++ b/venv/lib/python3.7/site-packages/_pytest/junitxml.py @@ -368,8 +368,8 @@ def pytest_addoption(parser): def pytest_configure(config): xmlpath = config.option.xmlpath - # prevent opening xmllog on slave nodes (xdist) - if xmlpath and not hasattr(config, "slaveinput"): + # prevent opening xmllog on subordinate nodes (xdist) + if xmlpath and not hasattr(config, "subordinateinput"): config._xml = LogXML( xmlpath, config.option.junitprefix, @@ -435,17 +435,17 @@ def __init__( def finalize(self, report): nodeid = getattr(report, "nodeid", report) # local hack to handle xdist report order - slavenode = getattr(report, "node", None) - reporter = self.node_reporters.pop((nodeid, slavenode)) + subordinatenode = getattr(report, "node", None) + reporter = self.node_reporters.pop((nodeid, subordinatenode)) if reporter is not None: reporter.finalize() def node_reporter(self, report): nodeid = getattr(report, "nodeid", report) # local hack to handle xdist report order - slavenode = getattr(report, "node", None) + subordinatenode = getattr(report, "node", None) - key = nodeid, slavenode + key = nodeid, subordinatenode if key in self.node_reporters: # TODO: breasks for --dist=each diff --git a/venv/lib/python3.7/site-packages/_pytest/pastebin.py b/venv/lib/python3.7/site-packages/_pytest/pastebin.py index 9559e326..143c0502 100644 --- a/venv/lib/python3.7/site-packages/_pytest/pastebin.py +++ b/venv/lib/python3.7/site-packages/_pytest/pastebin.py @@ -29,7 +29,7 @@ def pytest_configure(config): if config.option.pastebin == "all": tr = config.pluginmanager.getplugin("terminalreporter") # if no terminal reporter plugin is present, nothing we can do here; - # this can happen when this function executes in a slave node + # this can happen when this function executes in a subordinate node # when using pytest-xdist, for example if tr is not None: # pastebin file will be utf-8 encoded binary file diff --git a/venv/lib/python3.7/site-packages/_pytest/reports.py b/venv/lib/python3.7/site-packages/_pytest/reports.py index eabfe88e..d7239064 100644 --- a/venv/lib/python3.7/site-packages/_pytest/reports.py +++ b/venv/lib/python3.7/site-packages/_pytest/reports.py @@ -3,13 +3,13 @@ from _pytest._code.code import TerminalRepr -def getslaveinfoline(node): +def getsubordinateinfoline(node): try: - return node._slaveinfocache + return node._subordinateinfocache except AttributeError: - d = node.slaveinfo + d = node.subordinateinfo ver = "%s.%s.%s" % d["version_info"][:3] - node._slaveinfocache = s = "[%s] %s -- Python %s %s" % ( + node._subordinateinfocache = s = "[%s] %s -- Python %s %s" % ( d["id"], d["sysplatform"], ver, @@ -26,7 +26,7 @@ def __init__(self, **kw): def toterminal(self, out): if hasattr(self, "node"): - out.line(getslaveinfoline(self.node)) + out.line(getsubordinateinfoline(self.node)) longrepr = self.longrepr if longrepr is None: diff --git a/venv/lib/python3.7/site-packages/_pytest/resultlog.py b/venv/lib/python3.7/site-packages/_pytest/resultlog.py index cd3fde80..7c36d832 100644 --- a/venv/lib/python3.7/site-packages/_pytest/resultlog.py +++ b/venv/lib/python3.7/site-packages/_pytest/resultlog.py @@ -24,8 +24,8 @@ def pytest_addoption(parser): def pytest_configure(config): resultlog = config.option.resultlog - # prevent opening resultlog on slave nodes (xdist) - if resultlog and not hasattr(config, "slaveinput"): + # prevent opening resultlog on subordinate nodes (xdist) + if resultlog and not hasattr(config, "subordinateinput"): dirname = os.path.dirname(os.path.abspath(resultlog)) if not os.path.isdir(dirname): os.makedirs(dirname) diff --git a/venv/lib/python3.7/site-packages/execnet/gateway_base.py b/venv/lib/python3.7/site-packages/execnet/gateway_base.py index 90d575a3..9929a598 100644 --- a/venv/lib/python3.7/site-packages/execnet/gateway_base.py +++ b/venv/lib/python3.7/site-packages/execnet/gateway_base.py @@ -922,7 +922,7 @@ def readline(self): class BaseGateway(object): exc_info = sys.exc_info _sysex = sysex - id = "" + id = "" def __init__(self, io, id, _startcount=2): self.execmodel = io.execmodel @@ -1007,7 +1007,7 @@ def join(self, timeout=None): self._receivepool.waitall() -class SlaveGateway(BaseGateway): +class SubordinateGateway(BaseGateway): def _local_schedulexec(self, channel, sourcetask): sourcetask = loads_internal(sourcetask) @@ -1048,7 +1048,7 @@ def trace(msg): trace("joining receiver thread") self.join() except KeyboardInterrupt: - # in the slave we can't really do anything sensible + # in the subordinate we can't really do anything sensible trace("swallowing keyboardinterrupt, serve finished") def executetask(self, item): @@ -1530,5 +1530,5 @@ def init_popen_io(execmodel): def serve(io, id): - trace("creating slavegateway on %r" % (io,)) - SlaveGateway(io=io, id=id, _startcount=2).serve() + trace("creating subordinategateway on %r" % (io,)) + SubordinateGateway(io=io, id=id, _startcount=2).serve() diff --git a/venv/lib/python3.7/site-packages/execnet/gateway_bootstrap.py b/venv/lib/python3.7/site-packages/execnet/gateway_bootstrap.py index c843f24c..f918daf5 100644 --- a/venv/lib/python3.7/site-packages/execnet/gateway_bootstrap.py +++ b/venv/lib/python3.7/site-packages/execnet/gateway_bootstrap.py @@ -26,7 +26,7 @@ def bootstrap_import(io, spec): "sys.stdout.write('1')", "sys.stdout.flush()", "execmodel = get_execmodel(%r)" % spec.execmodel, - "serve(init_popen_io(execmodel), id='%s-slave')" % spec.id, + "serve(init_popen_io(execmodel), id='%s-subordinate')" % spec.id, ) s = io.read(1) assert s == "1".encode('ascii'), repr(s) @@ -40,7 +40,7 @@ def bootstrap_exec(io, spec): "execmodel = get_execmodel(%r)" % spec.execmodel, 'io = init_popen_io(execmodel)', "io.write('1'.encode('ascii'))", - "serve(io, id='%s-slave')" % spec.id, + "serve(io, id='%s-subordinate')" % spec.id, ) s = io.read(1) assert s == "1".encode('ascii') @@ -64,7 +64,7 @@ def bootstrap_socket(io, id): " execmodel = get_execmodel('thread')", "io = SocketIO(clientsock, execmodel)", "io.write('1'.encode('ascii'))", - "serve(io, id='%s-slave')" % id, + "serve(io, id='%s-subordinate')" % id, ) s = io.read(1) assert s == "1".encode('ascii') diff --git a/venv/lib/python3.7/site-packages/execnet/gateway_io.py b/venv/lib/python3.7/site-packages/execnet/gateway_io.py index 1979010c..00141810 100644 --- a/venv/lib/python3.7/site-packages/execnet/gateway_io.py +++ b/venv/lib/python3.7/site-packages/execnet/gateway_io.py @@ -15,7 +15,7 @@ from functools import partial -class Popen2IOMaster(Popen2IO): +class Popen2IOMain(Popen2IO): def __init__(self, args, execmodel): self.popen = p = execmodel.PopenPiped(args) Popen2IO.__init__(self, p.stdin, p.stdout, execmodel=execmodel) @@ -123,23 +123,23 @@ def vagrant_ssh_args(spec): def create_io(spec, execmodel): if spec.popen: args = popen_args(spec) - return Popen2IOMaster(args, execmodel) + return Popen2IOMain(args, execmodel) if spec.ssh: args = ssh_args(spec) - io = Popen2IOMaster(args, execmodel) + io = Popen2IOMain(args, execmodel) io.remoteaddress = spec.ssh return io if spec.vagrant_ssh: args = vagrant_ssh_args(spec) - io = Popen2IOMaster(args, execmodel) + io = Popen2IOMain(args, execmodel) io.remoteaddress = spec.vagrant_ssh return io # # Proxy Gateway handling code # -# master: proxy initiator -# forwarder: forwards between master and sub +# main: proxy initiator +# forwarder: forwards between main and sub # sub: sub process that is proxied to the initiator RIO_KILL = 1 @@ -150,9 +150,9 @@ def create_io(spec, execmodel): class ProxyIO(object): """ A Proxy IO object allows to instantiate a Gateway - through another "via" gateway. A master:ProxyIO object + through another "via" gateway. A main:ProxyIO object provides an IO object effectively connected to the sub - via the forwarder. To achieve this, master:ProxyIO interacts + via the forwarder. To achieve this, main:ProxyIO interacts with forwarder:serve_proxy_io() which itself instantiates and interacts with the sub. """ @@ -211,7 +211,7 @@ def serve_proxy_io(proxy_channelX): control_chan = proxy_channelX.receive() log("got control chan", control_chan) - # read data from master, forward it to the sub + # read data from main, forward it to the sub # XXX writing might block, thus blocking the receiver thread def forward_to_sub(data): log("forward data to sub, size %s" % len(data)) @@ -229,15 +229,15 @@ def controll(data): control_chan.send(sub_io.close_write()) control_chan.setcallback(controll) - # write data to the master coming from the sub - forward_to_master_file = proxy_channelX.makefile("w") + # write data to the main coming from the sub + forward_to_main_file = proxy_channelX.makefile("w") - # read bootstrap byte from sub, send it on to master + # read bootstrap byte from sub, send it on to main log('reading bootstrap byte from sub', spec.id) initial = sub_io.read(1) assert initial == '1'.encode('ascii'), initial log('forwarding bootstrap byte from sub', spec.id) - forward_to_master_file.write(initial) + forward_to_main_file.write(initial) # enter message forwarding loop while True: @@ -246,7 +246,7 @@ def controll(data): except EOFError: log('EOF from sub, terminating proxying loop', spec.id) break - message.to_io(forward_to_master_file) + message.to_io(forward_to_main_file) # proxy_channelX will be closed from remote_exec's finalization code if __name__ == "__channelexec__": diff --git a/venv/lib/python3.7/site-packages/execnet/multi.py b/venv/lib/python3.7/site-packages/execnet/multi.py index c100fd2a..516296dd 100644 --- a/venv/lib/python3.7/site-packages/execnet/multi.py +++ b/venv/lib/python3.7/site-packages/execnet/multi.py @@ -118,11 +118,11 @@ def makegateway(self, spec=None): spec.execmodel = self.remote_execmodel.backend if spec.via: assert not spec.socket - master = self[spec.via] - proxy_channel = master.remote_exec(gateway_io) + main = self[spec.via] + proxy_channel = main.remote_exec(gateway_io) proxy_channel.send(vars(spec)) - proxy_io_master = gateway_io.ProxyIO(proxy_channel, self.execmodel) - gw = gateway_bootstrap.bootstrap(proxy_io_master, spec) + proxy_io_main = gateway_io.ProxyIO(proxy_channel, self.execmodel) + gw = gateway_bootstrap.bootstrap(proxy_io_main, spec) elif spec.popen or spec.ssh or spec.vagrant_ssh: io = gateway_io.create_io(spec, execmodel=self.execmodel) gw = gateway_bootstrap.bootstrap(io, spec) diff --git a/venv/lib/python3.7/site-packages/mysql/connector/constants.py b/venv/lib/python3.7/site-packages/mysql/connector/constants.py index 709e675b..14563d84 100644 --- a/venv/lib/python3.7/site-packages/mysql/connector/constants.py +++ b/venv/lib/python3.7/site-packages/mysql/connector/constants.py @@ -511,7 +511,7 @@ class RefreshOption(_Constants): 'HOSTS': (1 << 3, 'Flush host cache'), 'STATUS': (1 << 4, 'Flush status variables'), 'THREADS': (1 << 5, 'Flush thread cache'), - 'SLAVE': (1 << 6, 'Reset master info and restart slave thread'), + 'SLAVE': (1 << 6, 'Reset main info and restart subordinate thread'), } diff --git a/venv/lib/python3.7/site-packages/mysql/connector/locales/eng/client_error.py b/venv/lib/python3.7/site-packages/mysql/connector/locales/eng/client_error.py index d145a174..31433566 100644 --- a/venv/lib/python3.7/site-packages/mysql/connector/locales/eng/client_error.py +++ b/venv/lib/python3.7/site-packages/mysql/connector/locales/eng/client_error.py @@ -52,8 +52,8 @@ CR_EMBEDDED_CONNECTION = u"Embedded server" CR_PROBE_SLAVE_STATUS = u"Error on SHOW SLAVE STATUS:" CR_PROBE_SLAVE_HOSTS = u"Error on SHOW SLAVE HOSTS:" -CR_PROBE_SLAVE_CONNECT = u"Error connecting to slave:" -CR_PROBE_MASTER_CONNECT = u"Error connecting to master:" +CR_PROBE_SLAVE_CONNECT = u"Error connecting to subordinate:" +CR_PROBE_MASTER_CONNECT = u"Error connecting to main:" CR_SSL_CONNECTION_ERROR = u"SSL connection error: %-.100s" CR_MALFORMED_PACKET = u"Malformed packet" CR_WRONG_LICENSE = u"This client library is licensed only for use with MySQL servers having '%s' license" diff --git a/venv/lib/python3.7/site-packages/numpy/distutils/system_info.py b/venv/lib/python3.7/site-packages/numpy/distutils/system_info.py index ba2b1f46..c0c61440 100644 --- a/venv/lib/python3.7/site-packages/numpy/distutils/system_info.py +++ b/venv/lib/python3.7/site-packages/numpy/distutils/system_info.py @@ -109,7 +109,7 @@ Authors: Pearu Peterson , February 2002 - David M. Cooke , April 2002 + David M. Cooke , April 2002 Copyright 2002 Pearu Peterson all rights reserved, Pearu Peterson diff --git a/venv/lib/python3.7/site-packages/numpy/testing/_private/nosetester.py b/venv/lib/python3.7/site-packages/numpy/testing/_private/nosetester.py index 19569a50..b89c52b5 100644 --- a/venv/lib/python3.7/site-packages/numpy/testing/_private/nosetester.py +++ b/venv/lib/python3.7/site-packages/numpy/testing/_private/nosetester.py @@ -414,7 +414,7 @@ def test(self, label='fast', verbose=1, extra_argv=None, # reset doctest state on every run import doctest - doctest.master = None + doctest.main = None if raise_warnings is None: raise_warnings = self.raise_warnings diff --git a/venv/lib/python3.7/site-packages/pip/_internal/vcs/git.py b/venv/lib/python3.7/site-packages/pip/_internal/vcs/git.py index 35ea9301..6ad0d6bd 100644 --- a/venv/lib/python3.7/site-packages/pip/_internal/vcs/git.py +++ b/venv/lib/python3.7/site-packages/pip/_internal/vcs/git.py @@ -246,7 +246,7 @@ def update(self, dest, url, rev_options): self.run_command(['fetch', '-q', '--tags'], cwd=dest) else: self.run_command(['fetch', '-q'], cwd=dest) - # Then reset to wanted revision (maybe even origin/master) + # Then reset to wanted revision (maybe even origin/main) rev_options = self.resolve_revision(dest, url, rev_options) cmd_args = ['reset', '--hard', '-q'] + rev_options.to_args() self.run_command(cmd_args, cwd=dest) diff --git a/venv/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py b/venv/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py index fdd40de4..c03dbb8c 100644 --- a/venv/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py +++ b/venv/lib/python3.7/site-packages/pip/_vendor/pkg_resources/__init__.py @@ -567,9 +567,9 @@ def __init__(self, entries=None): self.add_entry(entry) @classmethod - def _build_master(cls): + def _build_main(cls): """ - Prepare the master working set. + Prepare the main working set. """ ws = cls() try: @@ -3239,9 +3239,9 @@ def _initialize(g=globals()): @_call_aside -def _initialize_master_working_set(): +def _initialize_main_working_set(): """ - Prepare the master working set and make the ``require()`` + Prepare the main working set and make the ``require()`` API available. This function has explicit effects on the global state @@ -3251,7 +3251,7 @@ def _initialize_master_working_set(): Invocation by other packages is unsupported and done at their own risk. """ - working_set = WorkingSet._build_master() + working_set = WorkingSet._build_main() _declare_state('object', working_set=working_set) require = working_set.require diff --git a/venv/lib/python3.7/site-packages/pycares/__init__.py b/venv/lib/python3.7/site-packages/pycares/__init__.py index 2ef51869..a42b2407 100644 --- a/venv/lib/python3.7/site-packages/pycares/__init__.py +++ b/venv/lib/python3.7/site-packages/pycares/__init__.py @@ -645,12 +645,12 @@ def __init__(self, hostent, ttl, aliases): class ares_query_soa_result(AresResult): - __slots__ = ('nsname', 'hostmaster', 'serial', 'refresh', 'retry', 'expires', 'minttl', 'ttl') + __slots__ = ('nsname', 'hostmain', 'serial', 'refresh', 'retry', 'expires', 'minttl', 'ttl') type = 'SOA' def __init__(self, soa): self.nsname = maybe_str(_ffi.string(soa.nsname)) - self.hostmaster = maybe_str(_ffi.string(soa.hostmaster)) + self.hostmain = maybe_str(_ffi.string(soa.hostmain)) self.serial = soa.serial self.refresh = soa.refresh self.retry = soa.retry diff --git a/venv/lib/python3.7/site-packages/pycares/__main__.py b/venv/lib/python3.7/site-packages/pycares/__main__.py index 5fa68950..98c093a5 100644 --- a/venv/lib/python3.7/site-packages/pycares/__main__.py +++ b/venv/lib/python3.7/site-packages/pycares/__main__.py @@ -51,7 +51,7 @@ def cb(result, error): elif r.type == 'PTR': parts.append('%s\t%s' % (txt, r.name)) elif r.type == 'SOA': - parts.append('%s\t%s %s %d %d %d %d %d' % (txt, r.nsname, r.hostmaster, r.serial, r.refresh, r.retry, r.expires, r.minttl)) + parts.append('%s\t%s %s %d %d %d %d %d' % (txt, r.nsname, r.hostmain, r.serial, r.refresh, r.retry, r.expires, r.minttl)) elif r.type == 'SRV': parts.append('%s\t%d %d %d %s' % (txt, r.priority, r.weight, r.port, r.host)) elif r.type == 'TXT': diff --git a/venv/lib/python3.7/site-packages/pycparser/ply/lex.py b/venv/lib/python3.7/site-packages/pycparser/ply/lex.py index 4bdd76ca..eb368cb6 100644 --- a/venv/lib/python3.7/site-packages/pycparser/ply/lex.py +++ b/venv/lib/python3.7/site-packages/pycparser/ply/lex.py @@ -114,12 +114,12 @@ def __call__(self, *args, **kwargs): class Lexer: def __init__(self): - self.lexre = None # Master regular expression. This is a list of + self.lexre = None # Main regular expression. This is a list of # tuples (re, findex) where re is a compiled # regular expression and findex is a list # mapping regex group numbers to rules self.lexretext = None # Current regular expression strings - self.lexstatere = {} # Dictionary mapping lexer states to master regexs + self.lexstatere = {} # Dictionary mapping lexer states to main regexs self.lexstateretext = {} # Dictionary mapping lexer states to regex strings self.lexstaterenames = {} # Dictionary mapping lexer states to symbol names self.lexstate = 'INITIAL' # Current lexer state @@ -484,13 +484,13 @@ def _names_to_funcs(namelist, fdict): return result # ----------------------------------------------------------------------------- -# _form_master_re() +# _form_main_re() # # This function takes a list of all of the regex components and attempts to -# form the master regular expression. Given limitations in the Python re -# module, it may be necessary to break the master regex into separate expressions. +# form the main regular expression. Given limitations in the Python re +# module, it may be necessary to break the main regex into separate expressions. # ----------------------------------------------------------------------------- -def _form_master_re(relist, reflags, ldict, toknames): +def _form_main_re(relist, reflags, ldict, toknames): if not relist: return [] regex = '|'.join(relist) @@ -518,8 +518,8 @@ def _form_master_re(relist, reflags, ldict, toknames): m = int(len(relist)/2) if m == 0: m = 1 - llist, lre, lnames = _form_master_re(relist[:m], reflags, ldict, toknames) - rlist, rre, rnames = _form_master_re(relist[m:], reflags, ldict, toknames) + llist, lre, lnames = _form_main_re(relist[:m], reflags, ldict, toknames) + rlist, rre, rnames = _form_main_re(relist[m:], reflags, ldict, toknames) return (llist+rlist), (lre+rre), (lnames+rnames) # ----------------------------------------------------------------------------- @@ -943,7 +943,7 @@ def lex(module=None, object=None, debug=False, optimize=False, lextab='lextab', stateinfo = linfo.stateinfo regexs = {} - # Build the master regular expressions + # Build the main regular expressions for state in stateinfo: regex_list = [] @@ -963,13 +963,13 @@ def lex(module=None, object=None, debug=False, optimize=False, lextab='lextab', regexs[state] = regex_list - # Build the master regular expressions + # Build the main regular expressions if debug: debuglog.info('lex: ==== MASTER REGEXS FOLLOW ====') for state in regexs: - lexre, re_text, re_names = _form_master_re(regexs[state], reflags, ldict, linfo.toknames) + lexre, re_text, re_names = _form_main_re(regexs[state], reflags, ldict, linfo.toknames) lexobj.lexstatere[state] = lexre lexobj.lexstateretext[state] = re_text lexobj.lexstaterenames[state] = re_names diff --git a/venv/lib/python3.7/site-packages/pygame/tests/test_utils/png.py b/venv/lib/python3.7/site-packages/pygame/tests/test_utils/png.py index d0fba05a..4875a1a1 100644 --- a/venv/lib/python3.7/site-packages/pygame/tests/test_utils/png.py +++ b/venv/lib/python3.7/site-packages/pygame/tests/test_utils/png.py @@ -52,7 +52,7 @@ # http://trac.browsershots.org/browser/trunk/pypng/lib/png.py?rev=2885 # Incorporated into pypng by drj on 2009-03-12 from -# //depot/prj/bangaio/master/code/png.py#67 +# //depot/prj/bangaio/main/code/png.py#67 """ diff --git a/venv/lib/python3.7/site-packages/pytest_cache.py b/venv/lib/python3.7/site-packages/pytest_cache.py index b293e3fa..75c2627c 100644 --- a/venv/lib/python3.7/site-packages/pytest_cache.py +++ b/venv/lib/python3.7/site-packages/pytest_cache.py @@ -160,7 +160,7 @@ def pytest_collection_modifyitems(self, session, config, items): def pytest_sessionfinish(self, session): config = self.config - if config.getvalue("showcache") or hasattr(config, "slaveinput"): + if config.getvalue("showcache") or hasattr(config, "subordinateinput"): return config.cache.set("cache/lastfailed", self.lastfailed) diff --git a/venv/lib/python3.7/site-packages/scipy/optimize/lbfgsb.py b/venv/lib/python3.7/site-packages/scipy/optimize/lbfgsb.py index 5425ffff..06486a3b 100644 --- a/venv/lib/python3.7/site-packages/scipy/optimize/lbfgsb.py +++ b/venv/lib/python3.7/site-packages/scipy/optimize/lbfgsb.py @@ -11,7 +11,7 @@ ## License for the Python wrapper ## ============================== -## Copyright (c) 2004 David M. Cooke +## Copyright (c) 2004 David M. Cooke ## Permission is hereby granted, free of charge, to any person obtaining a ## copy of this software and associated documentation files (the "Software"), diff --git a/venv/lib/python3.7/site-packages/twisted/conch/scripts/tkconch.py b/venv/lib/python3.7/site-packages/twisted/conch/scripts/tkconch.py index 9c48e8a7..d2e0b86e 100644 --- a/venv/lib/python3.7/site-packages/twisted/conch/scripts/tkconch.py +++ b/venv/lib/python3.7/site-packages/twisted/conch/scripts/tkconch.py @@ -31,7 +31,7 @@ def __init__(self, *args, **params): ## Standard heading: initialization Tkinter.Frame.__init__(self, *args, **params) - self.master.title('TkConch') + self.main.title('TkConch') self.localRemoteVar = Tkinter.StringVar() self.localRemoteVar.set('local') @@ -91,7 +91,7 @@ def __init__(self, *args, **params): self.grid_rowconfigure(6, weight=1, minsize=64) self.grid_columnconfigure(2, weight=1, minsize=2) - self.master.protocol("WM_DELETE_WINDOW", sys.exit) + self.main.protocol("WM_DELETE_WINDOW", sys.exit) def getIdentityFile(self): @@ -165,8 +165,8 @@ def doConnect(self): tkMessageBox.showerror('TkConch', 'Missing host or username.') finished = 0 if finished: - self.master.quit() - self.master.destroy() + self.main.quit() + self.main.destroy() if options['log']: realout = sys.stdout log.startLogging(sys.stderr) @@ -180,8 +180,8 @@ def doConnect(self): port = int(options['port'] or 22) log.msg((host,port)) reactor.connectTCP(host, port, SSHClientFactory()) - frame.master.deiconify() - frame.master.title('%s@%s - TkConch' % (options['user'], options['host'])) + frame.main.deiconify() + frame.main.title('%s@%s - TkConch' % (options['user'], options['host'])) else: self.focus() diff --git a/venv/lib/python3.7/site-packages/twisted/conch/unix.py b/venv/lib/python3.7/site-packages/twisted/conch/unix.py index d9c3f05c..aa5166b7 100644 --- a/venv/lib/python3.7/site-packages/twisted/conch/unix.py +++ b/venv/lib/python3.7/site-packages/twisted/conch/unix.py @@ -203,10 +203,10 @@ def getPty(self, term, windowSize, modes): self.environ['TERM'] = term self.winSize = windowSize self.modes = modes - master, slave = pty.openpty() - ttyname = os.ttyname(slave) + main, subordinate = pty.openpty() + ttyname = os.ttyname(subordinate) self.environ['SSH_TTY'] = ttyname - self.ptyTuple = (master, slave, ttyname) + self.ptyTuple = (main, subordinate, ttyname) def openShell(self, proto): diff --git a/venv/lib/python3.7/site-packages/twisted/internet/defer.py b/venv/lib/python3.7/site-packages/twisted/internet/defer.py index aa2c881b..a0879b1c 100644 --- a/venv/lib/python3.7/site-packages/twisted/internet/defer.py +++ b/venv/lib/python3.7/site-packages/twisted/internet/defer.py @@ -296,7 +296,7 @@ def addCallbacks(self, callback, errback=None, """ Add a pair of callbacks (success and error) to this L{Deferred}. - These will be executed when the 'master' callback is run. + These will be executed when the 'main' callback is run. @return: C{self}. @rtype: a L{Deferred} diff --git a/venv/lib/python3.7/site-packages/twisted/internet/interfaces.py b/venv/lib/python3.7/site-packages/twisted/internet/interfaces.py index 3806b9ef..1addb49f 100644 --- a/venv/lib/python3.7/site-packages/twisted/internet/interfaces.py +++ b/venv/lib/python3.7/site-packages/twisted/internet/interfaces.py @@ -1195,7 +1195,7 @@ def spawnProcess(processProtocol, executable, args=(), env={}, path=None, POSIX systems.) @param usePTY: if true, run this process in a pseudo-terminal. - optionally a tuple of C{(masterfd, slavefd, ttyname)}, in which + optionally a tuple of C{(mainfd, subordinatefd, ttyname)}, in which case use those file descriptors. (Not available on all systems.) @param childFDs: A dictionary mapping file descriptors in the new child diff --git a/venv/lib/python3.7/site-packages/twisted/internet/process.py b/venv/lib/python3.7/site-packages/twisted/internet/process.py index 5caa841b..89b568f6 100644 --- a/venv/lib/python3.7/site-packages/twisted/internet/process.py +++ b/venv/lib/python3.7/site-packages/twisted/internet/process.py @@ -1019,23 +1019,23 @@ def __init__(self, reactor, executable, args, environment, path, proto, _BaseProcess.__init__(self, proto) if isinstance(usePTY, (tuple, list)): - masterfd, slavefd, _ = usePTY + mainfd, subordinatefd, _ = usePTY else: - masterfd, slavefd = pty.openpty() + mainfd, subordinatefd = pty.openpty() try: self._fork(path, uid, gid, executable, args, environment, - masterfd=masterfd, slavefd=slavefd) + mainfd=mainfd, subordinatefd=subordinatefd) except: if not isinstance(usePTY, (tuple, list)): - os.close(masterfd) - os.close(slavefd) + os.close(mainfd) + os.close(subordinatefd) raise # we are now in parent process: - os.close(slavefd) - fdesc.setNonBlocking(masterfd) - self.fd = masterfd + os.close(subordinatefd) + fdesc.setNonBlocking(mainfd) + self.fd = mainfd self.startReading() self.connected = 1 self.status = -1 @@ -1046,44 +1046,44 @@ def __init__(self, reactor, executable, args, environment, path, proto, registerReapProcessHandler(self.pid, self) - def _setupChild(self, masterfd, slavefd): + def _setupChild(self, mainfd, subordinatefd): """ Set up child process after C{fork()} but before C{exec()}. This involves: - - closing C{masterfd}, since it is not used in the subprocess + - closing C{mainfd}, since it is not used in the subprocess - creating a new session with C{os.setsid} - changing the controlling terminal of the process (and the new - session) to point at C{slavefd} + session) to point at C{subordinatefd} - - duplicating C{slavefd} to standard input, output, and error + - duplicating C{subordinatefd} to standard input, output, and error - closing all other open file descriptors (according to L{_listOpenFDs}) - re-setting all signal handlers to C{SIG_DFL} - @param masterfd: The master end of a PTY file descriptors opened with + @param mainfd: The main end of a PTY file descriptors opened with C{openpty}. - @type masterfd: L{int} + @type mainfd: L{int} - @param slavefd: The slave end of a PTY opened with C{openpty}. - @type slavefd: L{int} + @param subordinatefd: The subordinate end of a PTY opened with C{openpty}. + @type subordinatefd: L{int} """ - os.close(masterfd) + os.close(mainfd) os.setsid() - fcntl.ioctl(slavefd, termios.TIOCSCTTY, '') + fcntl.ioctl(subordinatefd, termios.TIOCSCTTY, '') for fd in range(3): - if fd != slavefd: + if fd != subordinatefd: os.close(fd) - os.dup2(slavefd, 0) # stdin - os.dup2(slavefd, 1) # stdout - os.dup2(slavefd, 2) # stderr + os.dup2(subordinatefd, 0) # stdin + os.dup2(subordinatefd, 1) # stdout + os.dup2(subordinatefd, 2) # stderr for fd in _listOpenFDs(): if fd > 2: diff --git a/venv/lib/python3.7/site-packages/twisted/mail/scripts/mailmail.py b/venv/lib/python3.7/site-packages/twisted/mail/scripts/mailmail.py index 2aa5d460..1352cc0b 100644 --- a/venv/lib/python3.7/site-packages/twisted/mail/scripts/mailmail.py +++ b/venv/lib/python3.7/site-packages/twisted/mail/scripts/mailmail.py @@ -333,7 +333,7 @@ def sendmail(host, options, ident): def senderror(failure, options): recipient = [options.sender] - sender = '"Internally Generated Message ({})"'.format( + sender = '"Internally Generated Message ({})"'.format( sys.argv[0], smtp.DNSNAME.decode("ascii")) error = NativeStringIO() failure.printTraceback(file=error) diff --git a/venv/lib/python3.7/site-packages/twisted/mail/test/test_mailmail.py b/venv/lib/python3.7/site-packages/twisted/mail/test/test_mailmail.py index 919b3f42..73a6f59f 100644 --- a/venv/lib/python3.7/site-packages/twisted/mail/test/test_mailmail.py +++ b/venv/lib/python3.7/site-packages/twisted/mail/test/test_mailmail.py @@ -367,7 +367,7 @@ def test_senderror(self): sender if an error occurs while sending mail to the recipient. """ def sendmail(host, sender, recipient, body): - self.assertRegex(sender, "postmaster@") + self.assertRegex(sender, "postmain@") self.assertEqual(recipient, ["testsender"]) self.assertRegex(body.getvalue(), "ValueError") return Deferred() diff --git a/venv/lib/python3.7/site-packages/twisted/names/client.py b/venv/lib/python3.7/site-packages/twisted/names/client.py index f7829dd4..3773a5c6 100644 --- a/venv/lib/python3.7/site-packages/twisted/names/client.py +++ b/venv/lib/python3.7/site-packages/twisted/names/client.py @@ -540,7 +540,7 @@ def clientConnectionFailed(self, connector, reason): C{deferred}. @type reason: L{twisted.python.failure.Failure} """ - # Copy the current pending deferreds then reset the master + # Copy the current pending deferreds then reset the main # pending list. This prevents triggering new deferreds which # may be added by callback or errback functions on the current # deferreds. diff --git a/venv/lib/python3.7/site-packages/twisted/names/test/test_dns.py b/venv/lib/python3.7/site-packages/twisted/names/test/test_dns.py index 03c31585..244fed0c 100644 --- a/venv/lib/python3.7/site-packages/twisted/names/test/test_dns.py +++ b/venv/lib/python3.7/site-packages/twisted/names/test/test_dns.py @@ -3211,7 +3211,7 @@ def bytes(cls): b'\xff\xff\xff\xff' # RR TTL b'\x00\x27' # RDLENGTH 39 b'\x03ns1\xc0\x0c' # Mname (ns1.example.com (compression ref b15) - b'\x0ahostmaster\xc0\x0c' # rname (hostmaster.example.com) + b'\x0ahostmain\xc0\x0c' # rname (hostmain.example.com) b'\xff\xff\xff\xfe' # Serial b'\x7f\xff\xff\xfd' # Refresh b'\x7f\xff\xff\xfc' # Retry @@ -3263,7 +3263,7 @@ def kwargs(cls): payload=dns.Record_SOA( ttl=0xffffffff, mname=b'ns1.example.com', - rname=b'hostmaster.example.com', + rname=b'hostmain.example.com', serial=0xfffffffe, refresh=0x7ffffffd, retry=0x7ffffffc, @@ -3386,7 +3386,7 @@ def bytes(cls): b'\xff\xff\xff\xff' # RR TTL b'\x00\x27' # RDLENGTH 39 b'\x03ns1\xc0\x0c' # mname (ns1.example.com (compression ref b15) - b'\x0ahostmaster\xc0\x0c' # rname (hostmaster.example.com) + b'\x0ahostmain\xc0\x0c' # rname (hostmain.example.com) b'\xff\xff\xff\xfe' # Serial b'\x7f\xff\xff\xfd' # Refresh b'\x7f\xff\xff\xfc' # Retry @@ -3452,7 +3452,7 @@ def kwargs(cls): payload=dns.Record_SOA( ttl=0xffffffff, mname=b'ns1.example.com', - rname=b'hostmaster.example.com', + rname=b'hostmain.example.com', serial=0xfffffffe, refresh=0x7ffffffd, retry=0x7ffffffc, diff --git a/venv/lib/python3.7/site-packages/twisted/names/test/test_names.py b/venv/lib/python3.7/site-packages/twisted/names/test/test_names.py index a1c6c633..8c96fcc5 100644 --- a/venv/lib/python3.7/site-packages/twisted/names/test/test_names.py +++ b/venv/lib/python3.7/site-packages/twisted/names/test/test_names.py @@ -66,7 +66,7 @@ def __init__(self, soa, records): my_soa = dns.Record_SOA( mname = u'my-domain.com', - rname = b'postmaster.test-domain.com', + rname = b'postmain.test-domain.com', serial = 130, refresh = 12345, minimum = 1, @@ -920,14 +920,14 @@ def queryProtocol(self, *args, **kwargs): class SecondaryAuthorityServiceTests(unittest.TestCase): """ Tests for L{SecondaryAuthorityService}, a service which keeps one or more - authorities up to date by doing zone transfers from a master. + authorities up to date by doing zone transfers from a main. """ def test_constructAuthorityFromHost(self): """ L{SecondaryAuthorityService} can be constructed with a C{str} giving a - master server address and several domains, causing the creation of a - secondary authority for each domain and that master server address and + main server address and several domains, causing the creation of a + secondary authority for each domain and that main server address and the default DNS port. """ primary = '192.168.1.2' @@ -948,9 +948,9 @@ def test_constructAuthorityFromHost(self): def test_constructAuthorityFromHostAndPort(self): """ L{SecondaryAuthorityService.fromServerAddressAndDomains} constructs a - new L{SecondaryAuthorityService} from a C{str} giving a master server + new L{SecondaryAuthorityService} from a C{str} giving a main server address and DNS port and several domains, causing the creation of a secondary - authority for each domain and that master server address and the given + authority for each domain and that main server address and the given DNS port. """ primary = '192.168.1.3' @@ -1083,9 +1083,9 @@ def test_lookupAddress(self): $TTL 1w example.com. IN SOA dns.example.com ( 2013120201 ; serial number of this zone file - 1d ; slave refresh - 2h ; slave retry time in case of a problem - 4w ; slave expiration time + 1d ; subordinate refresh + 2h ; subordinate retry time in case of a problem + 4w ; subordinate expiration time 1h ; maximum caching time in case of failed lookups ) diff --git a/venv/lib/python3.7/site-packages/twisted/plugin.py b/venv/lib/python3.7/site-packages/twisted/plugin.py index 82522ee2..59fe03ca 100644 --- a/venv/lib/python3.7/site-packages/twisted/plugin.py +++ b/venv/lib/python3.7/site-packages/twisted/plugin.py @@ -246,7 +246,7 @@ def pluginPackagePaths(name): # # Note as well that only '__init__.py' will be considered to make a # directory a package (and thus exclude it from this list). This means - # that if you create a master plugin package which has some other kind of + # that if you create a main plugin package which has some other kind of # __init__ (eg, __init__.pyc) it will be incorrectly treated as a # supplementary plugin directory. return [ diff --git a/venv/lib/python3.7/site-packages/twisted/python/test/test_release.py b/venv/lib/python3.7/site-packages/twisted/python/test/test_release.py index 5180880d..64f439f1 100644 --- a/venv/lib/python3.7/site-packages/twisted/python/test/test_release.py +++ b/venv/lib/python3.7/site-packages/twisted/python/test/test_release.py @@ -42,7 +42,7 @@ else: skip = None -testingSphinxConf = u"master_doc = 'index'\n" +testingSphinxConf = u"main_doc = 'index'\n" try: import pydoctor.driver @@ -673,7 +673,7 @@ class SphinxBuilderTests(TestCase): confContent = u"""\ source_suffix = '.rst' - master_doc = 'index' + main_doc = 'index' """ confContent = textwrap.dedent(confContent) diff --git a/venv/lib/python3.7/site-packages/twisted/test/test_iutils.py b/venv/lib/python3.7/site-packages/twisted/test/test_iutils.py index 2542547c..7ee8ae2c 100644 --- a/venv/lib/python3.7/site-packages/twisted/test/test_iutils.py +++ b/venv/lib/python3.7/site-packages/twisted/test/test_iutils.py @@ -151,7 +151,7 @@ def test_outputSignal(self): it to exit. """ # Use SIGKILL here because it's guaranteed to be delivered. Using - # SIGHUP might not work in, e.g., a buildbot slave run under the + # SIGHUP might not work in, e.g., a buildbot subordinate run under the # 'nohup' command. scriptFile = self.makeSourceFile([ "import sys, os, signal", diff --git a/venv/lib/python3.7/site-packages/twisted/test/test_process.py b/venv/lib/python3.7/site-packages/twisted/test/test_process.py index a3048d89..418754ce 100644 --- a/venv/lib/python3.7/site-packages/twisted/test/test_process.py +++ b/venv/lib/python3.7/site-packages/twisted/test/test_process.py @@ -1851,7 +1851,7 @@ def test_mockForkErrorClosePTY(self): def test_mockForkErrorPTYGivenFDs(self): """ - If a tuple is passed to C{usePTY} to specify slave and master file + If a tuple is passed to C{usePTY} to specify subordinate and main file descriptors and that C{os.fork} raises an exception, these file descriptors aren't closed. """ diff --git a/venv/lib/python3.7/site-packages/twisted/test/test_tcp.py b/venv/lib/python3.7/site-packages/twisted/test/test_tcp.py index b8791bb9..97c1ef3d 100644 --- a/venv/lib/python3.7/site-packages/twisted/test/test_tcp.py +++ b/venv/lib/python3.7/site-packages/twisted/test/test_tcp.py @@ -1050,15 +1050,15 @@ class ConnectionLosingProtocol(protocol.Protocol): def connectionMade(self): self.transport.write(b"1") self.transport.loseConnection() - self.master._connectionMade() - self.master.ports.append(self.transport) + self.main._connectionMade() + self.main.ports.append(self.transport) class NoopProtocol(protocol.Protocol): def connectionMade(self): self.d = defer.Deferred() - self.master.serverConns.append(self.d) + self.main.serverConns.append(self.d) def connectionLost(self, reason): self.d.callback(True) diff --git a/venv/lib/python3.7/site-packages/twisted/words/im/interfaces.py b/venv/lib/python3.7/site-packages/twisted/words/im/interfaces.py index fa2b0658..d64a8e99 100644 --- a/venv/lib/python3.7/site-packages/twisted/words/im/interfaces.py +++ b/venv/lib/python3.7/site-packages/twisted/words/im/interfaces.py @@ -14,7 +14,7 @@ # Persons have Conversation components # Groups have GroupConversation components # Persons and Groups are associated with specific Accounts -# At run-time, Clients/Accounts are slaved to a User Interface +# At run-time, Clients/Accounts are subordinated to a User Interface # (Note: User may be a bot, so don't assume all UIs are built on gui toolkits) diff --git a/venv/lib/python3.7/site-packages/twisted/words/protocols/irc.py b/venv/lib/python3.7/site-packages/twisted/words/protocols/irc.py index 389e10b9..1172d200 100644 --- a/venv/lib/python3.7/site-packages/twisted/words/protocols/irc.py +++ b/venv/lib/python3.7/site-packages/twisted/words/protocols/irc.py @@ -2281,7 +2281,7 @@ def ctcpQuery_USERINFO(self, user, channel, data): def ctcpQuery_CLIENTINFO(self, user, channel, data): """ - A master index of what CTCP tags this client knows. + A main index of what CTCP tags this client knows. If no arguments are provided, respond with a list of known tags, sorted in alphabetical order.