Merge branch master into master-slp

Author: Anselm Kruis

Doc/conf.py

@@ -76,7 +76,10 @@
 
 # Custom sidebar templates, filenames relative to this file.
 html_sidebars = {
-    'index': 'indexsidebar.html',
+    # Defaults taken from http://www.sphinx-doc.org/en/stable/config.html#confval-html_sidebars
+    # Removes the quick search block
+    '**': ['localtoc.html', 'relations.html', 'customsourcelink.html'],
+    'index': ['indexsidebar.html'],
 }
 
 # Additional templates that should be rendered to pages.

Doc/tools/pydoctheme/static/pydoctheme.css

@@ -22,6 +22,16 @@ div.related:first-child {
     border-bottom: 1px solid #ccc;
 }
 
+.inline-search {
+    display: inline;
+}
+form.inline-search input {
+    display: inline;
+}
+form.inline-search input[type="submit"] {
+    width: 30px;
+}
+
 div.sphinxsidebar {
     background-color: #eeeeee;
     border-radius: 5px;
@@ -45,6 +55,7 @@ div.sphinxsidebar a:hover {
     color: #0095C4;
 }
 
+form.inline-search input,
 div.sphinxsidebar input {
     font-family: 'Lucida Grande',Arial,sans-serif;
     border: 1px solid #999999;

Doc/tools/susp-ignored.csv

@@ -276,9 +276,6 @@ whatsnew/3.2,,:feed,>>> urllib.parse.urlparse('http://[dead:beef:cafe:5417:affe:
 whatsnew/3.2,,:gz,">>> with tarfile.open(name='myarchive.tar.gz', mode='w:gz') as tf:"
 whatsnew/3.2,,:location,zope9-location = ${zope9:location}
 whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf
-whatsnew/changelog,,:version,import sys; I = version[:version.index(' ')]
-whatsnew/changelog,,:gz,": TarFile opened with external fileobj and ""w:gz"" mode didn't"
-whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as"
 library/tarfile,149,:xz,'x:xz'
 library/xml.etree.elementtree,290,:sometag,prefix:sometag
 library/xml.etree.elementtree,301,:fictional,"<actors xmlns:fictional=""http://characters.example.com"""

Doc/tools/templates/customsourcelink.html

@@ -0,0 +1,10 @@
+{%- if show_source and has_source and sourcename %}
+  <div role="note" aria-label="source link">
+    <h3>{{ _('This Page') }}</h3>
+    <ul class="this-page-menu">
+      <li><a href="{{ pathto('bugs') }}">{% trans %}Report a Bug{% endtrans %}</a></li>
+      <li><a href="{{ pathto('_sources/' + sourcename, true)|e }}"
+            rel="nofollow">{{ _('Show Source') }}</a></li>
+    </ul>
+  </div>
+{%- endif %}

Doc/tools/templates/layout.html

@@ -12,8 +12,28 @@
           {%- endif %}
         </li>
 {% endblock %}
+{%- macro searchbox() %}
+{# modified from sphinx/themes/basic/searchbox.html #}
+    <div class="inline-search" style="display: none" role="search">
+        <form class="inline-search" action="{{ pathto('search') }}" method="get">
+          <input placeholder="{{ _('Quick search') }}" type="text" name="q" />
+          <input type="submit" value="{{ _('Go') }}" />
+          <input type="hidden" name="check_keywords" value="yes" />
+          <input type="hidden" name="area" value="default" />
+        </form>
+    </div>
+    <script type="text/javascript">$('.inline-search').show(0);</script>
+{%- endmacro %}
 {% block relbar1 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %}
 {% block relbar2 %} {% if builder != 'qthelp' %} {{ relbar() }} {% endif %} {% endblock %}
+{% block relbaritems %}
+    {%- if pagename != "search" and builder != "singlehtml" %}
+    <li class="right">
+        {{ searchbox() }}
+        {{ reldelim2 }}
+    </li>
+    {%- endif %}
+{% endblock %}
 {% block extrahead %}
     <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
     {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
@@ -90,13 +110,3 @@
     {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
     </div>
 {% endblock %}
-{% block sidebarsourcelink %}
-{%- if show_source and has_source and sourcename %}
-<h3>{{ _('This Page') }}</h3>
-<ul class="this-page-menu">
-  <li><a href="{{ pathto('bugs') }}">{% trans %}Report a Bug{% endtrans %}</a></li>
-  <li><a href="{{ pathto('_sources/' + sourcename, true)|e }}"
-         rel="nofollow">{% trans %}Show Source{% endtrans %}</a></li>
-</ul>
-{%- endif %}
-{% endblock %}

Doc/whatsnew/3.6.rst

@@ -981,6 +981,9 @@ Deprecated Python modules, functions and methods
   been deprecated in previous versions of Python in favour of
   :meth:`importlib.abc.Loader.exec_module`.
 
+* The :mod:`tkinter.tix` module is now deprecated.  :mod:`tkinter` users should
+  use :mod:`tkinter.ttk` instead.
+
 
 Deprecated functions and types of the C API
 -------------------------------------------

Lib/asyncio/futures.py

@@ -134,7 +134,15 @@ class Future:
     _loop = None
     _source_traceback = None
 
-    _blocking = False  # proper use of future (yield vs yield from)
+    # This field is used for a dual purpose:
+    # - Its presence is a marker to declare that a class implements
+    #   the Future protocol (i.e. is intended to be duck-type compatible).
+    #   The value must also be not-None, to enable a subclass to declare
+    #   that it is not compatible by setting this to None.
+    # - It is set by __iter__() below so that Task._step() can tell
+    #   the difference between `yield from Future()` (correct) vs.
+    #   `yield Future()` (incorrect).
+    _asyncio_future_blocking = False
 
     _log_traceback = False   # Used for Python 3.4 and later
     _tb_logger = None        # Used for Python 3.3 only
@@ -357,7 +365,7 @@ def set_exception(self, exception):
 
     def __iter__(self):
         if not self.done():
-            self._blocking = True
+            self._asyncio_future_blocking = True
             yield self  # This tells Task to wait for completion.
         assert self.done(), "yield from wasn't used with future"
         return self.result()  # May raise too.

Lib/asyncio/tasks.py

@@ -249,16 +249,17 @@ def _step(self, exc=None):
             self.set_exception(exc)
             raise
         else:
-            if isinstance(result, futures.Future):
+            blocking = getattr(result, '_asyncio_future_blocking', None)
+            if blocking is not None:
                 # Yielded Future must come from Future.__iter__().
                 if result._loop is not self._loop:
                     self._loop.call_soon(
                         self._step,
                         RuntimeError(
                             'Task {!r} got Future {!r} attached to a '
                             'different loop'.format(self, result)))
-                elif result._blocking:
-                    result._blocking = False
+                elif blocking:
+                    result._asyncio_future_blocking = False
                     result.add_done_callback(self._wakeup)
                     self._fut_waiter = result
                     if self._must_cancel:

Lib/importlib/_bootstrap_external.py

@@ -1440,8 +1440,3 @@ def _install(_bootstrap_module):
     if _os.__name__ == 'nt':
         sys.meta_path.append(WindowsRegistryFinder)
     sys.meta_path.append(PathFinder)
-
-    # XXX We expose a couple of classes in _bootstrap for the sake of
-    # a setuptools bug (https://bitbucket.org/pypa/setuptools/issue/378).
-    _bootstrap_module.FileFinder = FileFinder
-    _bootstrap_module.SourceFileLoader = SourceFileLoader

Lib/test/test_pep352.py renamed to Lib/test/test_baseexception.py

@@ -3,7 +3,7 @@
                      STRING, ENDMARKER, ENCODING, tok_name, detect_encoding,
                      open as tokenize_open, Untokenizer)
 from io import BytesIO
-from unittest import TestCase, mock
+from unittest import TestCase, mock, main
 import os
 import token
 
@@ -1529,12 +1529,13 @@ def test_random_files(self):
         tempdir = os.path.dirname(fn) or os.curdir
         testfiles = glob.glob(os.path.join(tempdir, "test*.py"))
 
-        # Tokenize is broken on test_pep3131.py because regular expressions are
-        # broken on the obscure unicode identifiers in it. *sigh*
-        # With roundtrip extended to test the 5-tuple mode of  untokenize,
-        # 7 more testfiles fail.  Remove them also until the failure is diagnosed.
+        # Tokenize is broken on test_unicode_identifiers.py because regular
+        # expressions are broken on the obscure unicode identifiers in it.
+        # *sigh* With roundtrip extended to test the 5-tuple mode of
+        # untokenize, 7 more testfiles fail.  Remove them also until the
+        # failure is diagnosed.
 
-        testfiles.remove(os.path.join(tempdir, "test_pep3131.py"))
+        testfiles.remove(os.path.join(tempdir, "test_unicode_identifiers.py"))
         for f in ('buffer', 'builtin', 'fileio', 'inspect', 'os', 'platform', 'sys'):
             testfiles.remove(os.path.join(tempdir, "test_%s.py") % f)
 
@@ -1564,4 +1565,4 @@ def test_indentation_semantics_retained(self):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    main()

Lib/test/test_pep509.py renamed to Lib/test/test_dict_version.py

@@ -59,6 +59,7 @@ Alicia Arlen
 Jeffrey Armstrong
 Jason Asbahr
 David Ascher
+Ammar Askar
 Chris AtLee
 Aymeric Augustin
 John Aycock

Lib/test/test_pep3151.py renamed to Lib/test/test_exception_hierarchy.py

@@ -10,6 +10,10 @@ What's New in Python 3.6.0 beta 1
 Core and Builtins
 -----------------
 
+- Issue #27213: Rework CALL_FUNCTION* opcodes to produce shorter and more
+  efficient bytecode. Patch by Demur Rumed, design by Serhiy Storchaka,
+  reviewed by Serhiy Storchaka and Victor Stinner.
+
 - Issue #27999: Make "global after use" a SyntaxError, and ditto for nonlocal.
   Patch by Ivan Levkivskyi.
 
@@ -769,6 +773,9 @@ Tools/Demos
 Documentation
 -------------
 
+- Issue #19489: Moved the search box from the sidebar to the header and footer
+  of each page.  Patch by Ammar Askar.
+
 - Issue #27285: Update documentation to reflect the deprecation of ``pyvenv``
   and normalize on the term "virtual environment". Patch by Steve Piercy.
 

Lib/test/test_pep479.py renamed to Lib/test/test_generator_stop.py

@@ -670,7 +670,7 @@ _Py_bytes_contains(const char *str, Py_ssize_t len, PyObject *arg)
  * against substr, using the start and end arguments. Returns
  * -1 on error, 0 if not found and 1 if found.
  */
-Py_LOCAL(int)
+static int
 tailmatch(const char *str, Py_ssize_t len, PyObject *substr,
           Py_ssize_t start, Py_ssize_t end, int direction)
 {
@@ -716,7 +716,7 @@ tailmatch(const char *str, Py_ssize_t len, PyObject *substr,
     return 0;
 }
 
-Py_LOCAL(PyObject *)
+static PyObject *
 _Py_bytes_tailmatch(const char *str, Py_ssize_t len,
                     const char *function_name, PyObject *args,
                     int direction)

Lib/test/test_tokenize.py

@@ -1500,7 +1500,7 @@ bytes_item(PyBytesObject *a, Py_ssize_t i)
     return PyLong_FromLong((unsigned char)a->ob_sval[i]);
 }
 
-Py_LOCAL(int)
+static int
 bytes_compare_eq(PyBytesObject *a, PyBytesObject *b)
 {
     int cmp;

Lib/test/test_pep277.py renamed to Lib/test/test_unicode_file_functions.py

@@ -5,7 +5,7 @@
 /* the more complicated methods.  parts of these should be pulled out into the
    shared code in bytes_methods.c to cut down on duplicate code bloat.  */
 
-Py_LOCAL_INLINE(PyObject *)
+static inline PyObject *
 return_self(PyObject *self)
 {
 #if !STRINGLIB_MUTABLE
@@ -90,7 +90,7 @@ stringlib_expandtabs(PyObject *self, PyObject *args, PyObject *kwds)
     return NULL;
 }
 
-Py_LOCAL_INLINE(PyObject *)
+static inline PyObject *
 pad(PyObject *self, Py_ssize_t left, Py_ssize_t right, char fill)
 {
     PyObject *u;
@@ -212,7 +212,7 @@ stringlib_zfill(PyObject *self, PyObject *args)
   ((char *)memchr((const void *)(target), c, target_len))
 
 
-Py_LOCAL_INLINE(Py_ssize_t)
+static Py_ssize_t
 countchar(const char *target, Py_ssize_t target_len, char c,
           Py_ssize_t maxcount)
 {
@@ -233,7 +233,7 @@ countchar(const char *target, Py_ssize_t target_len, char c,
 /* Algorithms for different cases of string replacement */
 
 /* len(self)>=1, from="", len(to)>=1, maxcount>=1 */
-Py_LOCAL(PyObject *)
+static PyObject *
 stringlib_replace_interleave(PyObject *self,
                              const char *to_s, Py_ssize_t to_len,
                              Py_ssize_t maxcount)
@@ -304,7 +304,7 @@ stringlib_replace_interleave(PyObject *self,
 
 /* Special case for deleting a single character */
 /* len(self)>=1, len(from)==1, to="", maxcount>=1 */
-Py_LOCAL(PyObject *)
+static PyObject *
 stringlib_replace_delete_single_character(PyObject *self,
                                           char from_c, Py_ssize_t maxcount)
 {
@@ -348,7 +348,7 @@ stringlib_replace_delete_single_character(PyObject *self,
 
 /* len(self)>=1, len(from)>=2, to="", maxcount>=1 */
 
-Py_LOCAL(PyObject *)
+static PyObject *
 stringlib_replace_delete_substring(PyObject *self,
                                    const char *from_s, Py_ssize_t from_len,
                                    Py_ssize_t maxcount)
@@ -400,7 +400,7 @@ stringlib_replace_delete_substring(PyObject *self,
 }
 
 /* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */
-Py_LOCAL(PyObject *)
+static PyObject *
 stringlib_replace_single_character_in_place(PyObject *self,
                                             char from_c, char to_c,
                                             Py_ssize_t maxcount)
@@ -447,7 +447,7 @@ stringlib_replace_single_character_in_place(PyObject *self,
 }
 
 /* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */
-Py_LOCAL(PyObject *)
+static PyObject *
 stringlib_replace_substring_in_place(PyObject *self,
                                      const char *from_s, Py_ssize_t from_len,
                                      const char *to_s, Py_ssize_t to_len,
@@ -499,7 +499,7 @@ stringlib_replace_substring_in_place(PyObject *self,
 }
 
 /* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */
-Py_LOCAL(PyObject *)
+static PyObject *
 stringlib_replace_single_character(PyObject *self,
                                    char from_c,
                                    const char *to_s, Py_ssize_t to_len,
@@ -563,7 +563,7 @@ stringlib_replace_single_character(PyObject *self,
 }
 
 /* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */
-Py_LOCAL(PyObject *)
+static PyObject *
 stringlib_replace_substring(PyObject *self,
                             const char *from_s, Py_ssize_t from_len,
                             const char *to_s, Py_ssize_t to_len,
@@ -632,7 +632,7 @@ stringlib_replace_substring(PyObject *self,
 }
 
 
-Py_LOCAL(PyObject *)
+static PyObject *
 stringlib_replace(PyObject *self,
                   const char *from_s, Py_ssize_t from_len,
                   const char *to_s, Py_ssize_t to_len,

Lib/test/test_pep3131.py renamed to Lib/test/test_unicode_identifiers.py

@@ -10936,7 +10936,7 @@ unicode_compare(PyObject *str1, PyObject *str2)
 #undef COMPARE
 }
 
-Py_LOCAL(int)
+static int
 unicode_compare_eq(PyObject *str1, PyObject *str2)
 {
     int kind;