Fix Sphynx syntax in the memory.rst document

diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index 0597ef71366571765b64200daf5e70b9018df37a..588668ee853c65ae1b023c53d965a5c8d1268dde 100644 (file)
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -96,7 +96,7 @@ Allocator Domains
 =================
 
 All allocating functions belong to one of three different "domains" (see also
-:c:type`PyMemAllocatorDomain`). These domains represent different allocation
+:c:type:`PyMemAllocatorDomain`). These domains represent different allocation
 strategies and are optimized for different purposes. The specific details on
 how every domain allocates memory or what internal functions each domain calls
 is considered an implementation detail, but for debugging purposes a simplified

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 806f7d279d128e9131e97d94cd9f704764c862b6..2cb634ea95ec638cec644437e46f8984aa41b434 100644 (file)
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION        10
 #define PY_MICRO_VERSION        0
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL       4
+#define PY_RELEASE_SERIAL       5
 
 /* Version as a string */
-#define PY_VERSION              "3.10.0a4+"
+#define PY_VERSION              "3.10.0a5"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 93d2ddfba5d048f826f7b200f6dd53df31184afc..ba4e2902caad14ffd25e155cfe0f61b1b73e34ad 100644 (file)
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Mon Jan  4 17:25:50 2021
+# Autogenerated by Sphinx on Tue Feb  2 20:44:10 2021
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -2561,8 +2561,10 @@ topics = {'assert': 'The "assert" statement\n'
              'usage\n'
              'patterns to be encapsulated for convenient reuse.\n'
              '\n'
-             '   with_stmt ::= "with" with_item ("," with_item)* ":" suite\n'
-             '   with_item ::= expression ["as" target]\n'
+             '   with_stmt          ::= "with" ( "(" with_stmt_contents ","? '
+             '")" | with_stmt_contents ) ":" suite\n'
+             '   with_stmt_contents ::= with_item ("," with_item)*\n'
+             '   with_item          ::= expression ["as" target]\n'
              '\n'
              'The execution of the "with" statement with one “item” proceeds '
              'as\n'
@@ -2654,9 +2656,23 @@ topics = {'assert': 'The "assert" statement\n'
              '       with B() as b:\n'
              '           SUITE\n'
              '\n'
+             'You can also write multi-item context managers in multiple lines '
+             'if\n'
+             'the items are surrounded by parentheses. For example:\n'
+             '\n'
+             '   with (\n'
+             '       A() as a,\n'
+             '       B() as b,\n'
+             '   ):\n'
+             '       SUITE\n'
+             '\n'
              'Changed in version 3.1: Support for multiple context '
              'expressions.\n'
              '\n'
+             'Changed in version 3.10: Support for using grouping parentheses '
+             'to\n'
+             'break the statement in multiple lines.\n'
+             '\n'
              'See also:\n'
              '\n'
              '  **PEP 343** - The “with” statement\n'
@@ -5268,9 +5284,9 @@ topics = {'assert': 'The "assert" statement\n'
                   '   |           | in the form ‘+000000120’. This alignment '
                   'option is only    |\n'
                   '   |           | valid for numeric types.  It becomes the '
-                  'default when ‘0’  |\n'
-                  '   |           | immediately precedes the field '
-                  'width.                      |\n'
+                  'default for       |\n'
+                  '   |           | numbers when ‘0’ immediately precedes the '
+                  'field width.     |\n'
                   '   '
                   '+-----------+------------------------------------------------------------+\n'
                   '   | "\'^\'"     | Forces the field to be centered within '
@@ -5378,6 +5394,10 @@ topics = {'assert': 'The "assert" statement\n'
                   'with an\n'
                   '*alignment* type of "\'=\'".\n'
                   '\n'
+                  'Changed in version 3.10: Preceding the *width* field by '
+                  '"\'0\'" no\n'
+                  'longer affects the default alignment for strings.\n'
+                  '\n'
                   'The *precision* is a decimal number indicating how many '
                   'digits should\n'
                   'be displayed after the decimal point for a floating point '
@@ -13989,8 +14009,10 @@ topics = {'assert': 'The "assert" statement\n'
          'usage\n'
          'patterns to be encapsulated for convenient reuse.\n'
          '\n'
-         '   with_stmt ::= "with" with_item ("," with_item)* ":" suite\n'
-         '   with_item ::= expression ["as" target]\n'
+         '   with_stmt          ::= "with" ( "(" with_stmt_contents ","? ")" | '
+         'with_stmt_contents ) ":" suite\n'
+         '   with_stmt_contents ::= with_item ("," with_item)*\n'
+         '   with_item          ::= expression ["as" target]\n'
          '\n'
          'The execution of the "with" statement with one “item” proceeds as\n'
          'follows:\n'
@@ -14076,8 +14098,20 @@ topics = {'assert': 'The "assert" statement\n'
          '       with B() as b:\n'
          '           SUITE\n'
          '\n'
+         'You can also write multi-item context managers in multiple lines if\n'
+         'the items are surrounded by parentheses. For example:\n'
+         '\n'
+         '   with (\n'
+         '       A() as a,\n'
+         '       B() as b,\n'
+         '   ):\n'
+         '       SUITE\n'
+         '\n'
          'Changed in version 3.1: Support for multiple context expressions.\n'
          '\n'
+         'Changed in version 3.10: Support for using grouping parentheses to\n'
+         'break the statement in multiple lines.\n'
+         '\n'
          'See also:\n'
          '\n'
          '  **PEP 343** - The “with” statement\n'

diff --git a/README.rst b/README.rst
index 3eae020b037b338c803059bef8ec8661cc0670a9..0d868c686141541652a89ba495ca4b9f2dbbe8a2 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-This is Python version 3.10.0 alpha 4
+This is Python version 3.10.0 alpha 5
 =====================================
 
 .. image:: https://travis-ci.com/python/cpython.svg?branch=master