SnapRoute · bopopescu · Jul 26, 2020
diff --git a/Jinja2-2.9.6/docs/conf.py b/Jinja2-2.9.6/docs/conf.py
@@ -31,8 +31,8 @@
 # The suffix of source filenames.
 source_suffix = '.rst'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General substitutions.
 project = 'Jinja2'

diff --git a/Jinja2-2.9.6/examples/basic/test.py b/Jinja2-2.9.6/examples/basic/test.py
@@ -3,7 +3,7 @@
 
 env = Environment(loader=DictLoader({
 'child.html': u'''\
-{% extends master_layout or 'master.html' %}
+{% extends main_layout or 'main.html' %}
 {% include helpers = 'helpers.html' %}
 {% macro get_the_answer() %}42{% endmacro %}
 {% title = 'Hello World' %}
@@ -12,7 +12,7 @@
     {{ helpers.conspirate() }}
 {% endblock %}
 ''',
-'master.html': u'''\
+'main.html': u'''\
 <!doctype html>
 <title>{{ title }}</title>
 {% block body %}{% endblock %}

diff --git a/cffi-1.10.0/doc/source/conf.py b/cffi-1.10.0/doc/source/conf.py
@@ -33,8 +33,8 @@
 # The encoding of source files.
 #source_encoding = 'utf-8'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = u'CFFI'

diff --git a/cryptography-2.0.3/docs/conf.py b/cryptography-2.0.3/docs/conf.py
@@ -66,8 +66,8 @@
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = 'Cryptography'

diff --git a/cryptography-2.0.3/src/_cffi_src/openssl/ssl.py b/cryptography-2.0.3/src/_cffi_src/openssl/ssl.py
@@ -416,7 +416,7 @@
 int SSL_SESSION_set1_id_context(SSL_SESSION *, const unsigned char *,
                                 unsigned int);
 /* Added in 1.1.0 for the great opaquing of structs */
-size_t SSL_SESSION_get_master_key(const SSL_SESSION *, unsigned char *,
+size_t SSL_SESSION_get_main_key(const SSL_SESSION *, unsigned char *,
                                   size_t);
 size_t SSL_get_client_random(const SSL *, unsigned char *, size_t);
 size_t SSL_get_server_random(const SSL *, unsigned char *, size_t);
@@ -475,18 +475,18 @@
 }
 /* Added in 1.1.0 as well */
 /* from ssl/ssl_lib.c */
-size_t SSL_SESSION_get_master_key(const SSL_SESSION *session,
+size_t SSL_SESSION_get_main_key(const SSL_SESSION *session,
                                unsigned char *out, size_t outlen)
 {
-    if (session->master_key_length < 0) {
+    if (session->main_key_length < 0) {
         /* Should never happen */
         return 0;
     }
     if (outlen == 0)
-        return session->master_key_length;
-    if (outlen > (size_t)session->master_key_length)
-        outlen = session->master_key_length;
-    memcpy(out, session->master_key, outlen);
+        return session->main_key_length;
+    if (outlen > (size_t)session->main_key_length)
+        outlen = session->main_key_length;
+    memcpy(out, session->main_key, outlen);
     return outlen;
 }
 #endif

diff --git a/enum34-1.1.6/enum/test.py b/enum34-1.1.6/enum/test.py
@@ -673,7 +673,7 @@ def test_exploding_pickle(self):
 
     def test_string_enum(self):
         class SkillLevel(str, Enum):
-            master = 'what is the sound of one hand clapping?'
+            main = 'what is the sound of one hand clapping?'
             journeyman = 'why did the chicken cross the road?'
             apprentice = 'knock, knock!'
         self.assertEqual(SkillLevel.apprentice, 'knock, knock!')

diff --git a/natsort-5.1.0/docs/source/conf.py b/natsort-5.1.0/docs/source/conf.py
@@ -58,8 +58,8 @@ def current_version():
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = u'natsort'

diff --git a/netaddr-0.7.19/docs/source/conf.py b/netaddr-0.7.19/docs/source/conf.py
@@ -36,8 +36,8 @@
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = u'netaddr'

diff --git a/pexpect-4.2.1/doc/conf.py b/pexpect-4.2.1/doc/conf.py
@@ -40,8 +40,8 @@
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = u'Pexpect'

diff --git a/pexpect-4.2.1/tests/platform_checks/check_handler.py b/pexpect-4.2.1/tests/platform_checks/check_handler.py
@@ -52,7 +52,7 @@ def main ():
 		print '\tChild appears to be dead.'
 #		print str(e)
 	print
-	print 'Reading from master fd:', os.read (fd, 1000)
+	print 'Reading from main fd:', os.read (fd, 1000)
 
 
 

diff --git a/pip-9.0.1/docs/conf.py b/pip-9.0.1/docs/conf.py
@@ -46,8 +46,8 @@
 # The encoding of source files.
 # source_encoding = 'utf-8'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = 'pip'

diff --git a/pip-9.0.1/pip/_vendor/pkg_resources/__init__.py b/pip-9.0.1/pip/_vendor/pkg_resources/__init__.py
@@ -644,9 +644,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:
@@ -3016,9 +3016,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
@@ -3028,7 +3028,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/pip-9.0.1/pip/vcs/git.py b/pip-9.0.1/pip/vcs/git.py
@@ -118,7 +118,7 @@ def update(self, dest, 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)
         if rev_options:
             rev_options = self.check_rev_options(
                 rev_options[0], dest, rev_options,
@@ -133,7 +133,7 @@ def obtain(self, dest):
             rev_options = [rev]
             rev_display = ' (to %s)' % rev
         else:
-            rev_options = ['origin/master']
+            rev_options = ['origin/main']
             rev_display = ''
         if self.check_destination(dest, url, rev_options, rev_display):
             logger.info(

diff --git a/ptyprocess-0.5.2/docs/conf.py b/ptyprocess-0.5.2/docs/conf.py
@@ -43,8 +43,8 @@
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = u'Ptyprocess'

diff --git a/ptyprocess-0.5.2/ptyprocess/ptyprocess.py b/ptyprocess-0.5.2/ptyprocess/ptyprocess.py
@@ -225,7 +225,7 @@ def spawn(
             pid, fd = _fork_pty.fork_pty()
 
         # Some platforms must call setwinsize() and setecho() from the
-        # child process, and others from the master process. We do both,
+        # child process, and others from the main process. We do both,
         # allowing IOError for either.
 
         if pid == CHILD:

diff --git a/pyOpenSSL-17.2.0/doc/conf.py b/pyOpenSSL-17.2.0/doc/conf.py
@@ -68,8 +68,8 @@ def find_version(*file_paths):
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = u'pyOpenSSL'

diff --git a/pyOpenSSL-17.2.0/src/OpenSSL/SSL.py b/pyOpenSSL-17.2.0/src/OpenSSL/SSL.py
@@ -1925,20 +1925,20 @@ 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):
         """
-        Get a copy of the master key.
+        Get a copy of the main key.
 
         :return: A string representing the state
         """
         session = _lib.SSL_get_session(self._ssl)
         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 sock_shutdown(self, *args, **kwargs):

diff --git a/pyOpenSSL-17.2.0/tests/test_ssl.py b/pyOpenSSL-17.2.0/tests/test_ssl.py
@@ -2064,7 +2064,7 @@ class TestConnection(object):
     """
     # XXX get_peer_certificate -> None
     # XXX sock_shutdown
-    # XXX master_key -> TypeError
+    # XXX main_key -> TypeError
     # XXX server_random -> TypeError
     # XXX connect -> TypeError
     # XXX connect_ex -> TypeError
@@ -2488,10 +2488,10 @@ def makeClient(socket):
         # This is a proxy: in general, we have no access to any unique
         # identifier for the session (new enough versions of OpenSSL expose
         # a hash which could be usable, but "new enough" is very, very new).
-        # Instead, exploit the fact that the master key is re-used if the
-        # session is re-used.  As long as the master key for the two
+        # Instead, exploit the fact that the main key is re-used if the
+        # session is re-used.  As long as the main key for the two
         # connections is the same, the session was re-used!
-        assert originalServer.master_key() == resumedServer.master_key()
+        assert originalServer.main_key() == resumedServer.main_key()
 
     def test_set_session_wrong_method(self):
         """
@@ -3336,7 +3336,7 @@ def test_memory_connect(self):
         client_conn = self._client(None)
 
         # There should be no key or nonces yet.
-        assert server_conn.master_key() is None
+        assert server_conn.main_key() is None
         assert server_conn.client_random() is None
         assert server_conn.server_random() is None
 
@@ -3346,7 +3346,7 @@ def test_memory_connect(self):
         assert interact_in_memory(client_conn, server_conn) is None
 
         # Now that the handshake is done, there should be a key and nonces.
-        assert server_conn.master_key() is not None
+        assert server_conn.main_key() is not None
         assert server_conn.client_random() is not None
         assert server_conn.server_random() is not None
         assert server_conn.client_random() == client_conn.client_random()

diff --git a/pycparser-2.18/pycparser/ply/lex.py b/pycparser-2.18/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/pycrypto-2.6.1/lib/Crypto/Protocol/KDF.py b/pycrypto-2.6.1/lib/Crypto/Protocol/KDF.py
@@ -24,11 +24,11 @@
 """This file contains a collection of standard key derivation functions.
 
 A key derivation function derives one or more secondary secret keys from
-one primary secret (a master key or a pass phrase).
+one primary secret (a main key or a pass phrase).
 
 This is typically done to insulate the secondary keys from each other,
 to avoid that leakage of a secondary key compromises the security of the
-master key, or to thwart attacks on pass phrases (e.g. via rainbow tables).
+main key, or to thwart attacks on pass phrases (e.g. via rainbow tables).
 
 :undocumented: __revision__
 """