Merge tag 'v3.6.4rc1' into 3.6

Author: ned-deily

Include/patchlevel.h

@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	6
-#define PY_MICRO_VERSION	3
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
-#define PY_RELEASE_SERIAL	0
+#define PY_MICRO_VERSION	4
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
+#define PY_RELEASE_SERIAL	1
 
 /* Version as a string */
-#define PY_VERSION      	"3.6.3+"
+#define PY_VERSION      	"3.6.4rc1"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

Lib/pydoc_data/topics.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Mon Sep 18 23:00:11 2017
+# Autogenerated by Sphinx on Tue Dec  5 03:11:02 2017
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -2674,7 +2674,6 @@
              '   mgr = (EXPR)\n'
              '   aexit = type(mgr).__aexit__\n'
              '   aenter = type(mgr).__aenter__(mgr)\n'
-             '   exc = True\n'
              '\n'
              '   VAR = await aenter\n'
              '   try:\n'
@@ -4503,12 +4502,6 @@
              '   3.14    10.    .001    1e100    3.14e-10    0e0    '
              '3.14_15_93\n'
              '\n'
-             'Note that numeric literals do not include a sign; a phrase like '
-             '"-1"\n'
-             'is actually an expression composed of the unary operator "-" and '
-             'the\n'
-             'literal "1".\n'
-             '\n'
              'Changed in version 3.6: Underscores are now allowed for '
              'grouping\n'
              'purposes in literals.\n',
@@ -5497,7 +5490,7 @@
            '\n'
            '**CPython implementation detail:** The current implementation does '
            'not\n'
-           'enforce some of these restriction, but programs should not abuse '
+           'enforce some of these restrictions, but programs should not abuse '
            'this\n'
            'freedom, as future implementations may enforce them or silently '
            'change\n'
@@ -6744,7 +6737,9 @@
                      'Addition and subtraction              |\n'
                      '+-------------------------------------------------+---------------------------------------+\n'
                      '| "*", "@", "/", "//", "%"                        | '
-                     'Multiplication, matrix multiplication |\n'
+                     'Multiplication, matrix                |\n'
+                     '|                                                 | '
+                     'multiplication, division, floor       |\n'
                      '|                                                 | '
                      'division, remainder [5]               |\n'
                      '+-------------------------------------------------+---------------------------------------+\n'
@@ -10102,11 +10097,6 @@
             'or\n'
             'greater must be expressed with escapes.\n'
             '\n'
-            'As of Python 3.3 it is possible again to prefix string literals '
-            'with a\n'
-            '"u" prefix to simplify maintenance of dual 2.x and 3.x '
-            'codebases.\n'
-            '\n'
             'Both string and bytes literals may optionally be prefixed with a\n'
             'letter "\'r\'" or "\'R\'"; such strings are called *raw strings* '
             'and treat\n'