Merge branch '3.11' into backport-pythongh-95853-3.11

tiran · Sep 12, 2022 · 2ff3ed2 · 2ff3ed2
2 parents 5939c34 + 14adf46
commit 2ff3ed2
Show file tree

Hide file tree

Showing 43 changed files with 436 additions and 126 deletions.
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION        11
 #define PY_MICRO_VERSION        0
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL       1
+#define PY_RELEASE_SERIAL       2
 
 /* Version as a string */
-#define PY_VERSION              "3.11.0rc1+"
+#define PY_VERSION              "3.11.0rc2+"
 /*--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
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Fri Aug  5 15:44:44 2022
+# Autogenerated by Sphinx on Sun Sep 11 20:22:13 2022
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -3482,8 +3482,8 @@
              '   there is matched against the whole object rather than an '
              'attribute.\n'
              '   For example "int(0|1)" matches the value "0", but not the '
-             'values\n'
-             '   "0.0" or "False".\n'
+             'value\n'
+             '   "0.0".\n'
              '\n'
              'In simple terms "CLS(P1, attr=P2)" matches only if the '
              'following\n'
@@ -8983,31 +8983,7 @@
                  '   still alive.  The list is in definition order.  Example:\n'
                  '\n'
                  '      >>> int.__subclasses__()\n'
-                 "      [<class 'bool'>]\n"
-                 '\n'
-                 '-[ Footnotes ]-\n'
-                 '\n'
-                 '[1] Additional information on these special methods may be '
-                 'found in\n'
-                 '    the Python Reference Manual (Basic customization).\n'
-                 '\n'
-                 '[2] As a consequence, the list "[1, 2]" is considered equal '
-                 'to "[1.0,\n'
-                 '    2.0]", and similarly for tuples.\n'
-                 '\n'
-                 '[3] They must have since the parser can’t tell the type of '
-                 'the\n'
-                 '    operands.\n'
-                 '\n'
-                 '[4] Cased characters are those with general category '
-                 'property being\n'
-                 '    one of “Lu” (Letter, uppercase), “Ll” (Letter, '
-                 'lowercase), or “Lt”\n'
-                 '    (Letter, titlecase).\n'
-                 '\n'
-                 '[5] To format only a tuple you should therefore provide a '
-                 'singleton\n'
-                 '    tuple whose only element is the tuple to be formatted.\n',
+                 "      [<class 'bool'>]\n",
  'specialnames': 'Special method names\n'
                  '********************\n'
                  '\n'
@@ -12256,8 +12232,8 @@
             '| Escape Sequence   | Meaning                           | Notes   '
             '|\n'
             '|===================|===================================|=========|\n'
-            '| "\\newline"        | Backslash and newline ignored     '
-            '|         |\n'
+            '| "\\"<newline>      | Backslash and newline ignored     | '
+            '(1)     |\n'
             '+-------------------+-----------------------------------+---------+\n'
             '| "\\\\"              | Backslash ("\\")                   '
             '|         |\n'
@@ -12290,10 +12266,10 @@
             '|         |\n'
             '+-------------------+-----------------------------------+---------+\n'
             '| "\\ooo"            | Character with octal value *ooo*  | '
-            '(1,3)   |\n'
+            '(2,4)   |\n'
             '+-------------------+-----------------------------------+---------+\n'
             '| "\\xhh"            | Character with hex value *hh*     | '
-            '(2,3)   |\n'
+            '(3,4)   |\n'
             '+-------------------+-----------------------------------+---------+\n'
             '\n'
             'Escape sequences only recognized in string literals are:\n'
@@ -12303,45 +12279,57 @@
             '|\n'
             '|===================|===================================|=========|\n'
             '| "\\N{name}"        | Character named *name* in the     | '
-            '(4)     |\n'
+            '(5)     |\n'
             '|                   | Unicode database                  |         '
             '|\n'
             '+-------------------+-----------------------------------+---------+\n'
             '| "\\uxxxx"          | Character with 16-bit hex value   | '
-            '(5)     |\n'
+            '(6)     |\n'
             '|                   | *xxxx*                            |         '
             '|\n'
             '+-------------------+-----------------------------------+---------+\n'
             '| "\\Uxxxxxxxx"      | Character with 32-bit hex value   | '
-            '(6)     |\n'
+            '(7)     |\n'
             '|                   | *xxxxxxxx*                        |         '
             '|\n'
             '+-------------------+-----------------------------------+---------+\n'
             '\n'
             'Notes:\n'
             '\n'
-            '1. As in Standard C, up to three octal digits are accepted.\n'
+            '1. A backslash can be added at the end of a line to ignore the\n'
+            '   newline:\n'
+            '\n'
+            "      >>> 'This string will not include \\\n"
+            "      ... backslashes or newline characters.'\n"
+            "      'This string will not include backslashes or newline "
+            "characters.'\n"
+            '\n'
+            '   The same result can be achieved using triple-quoted strings, '
+            'or\n'
+            '   parentheses and string literal concatenation.\n'
+            '\n'
+            '2. As in Standard C, up to three octal digits are accepted.\n'
             '\n'
             '   Changed in version 3.11: Octal escapes with value larger than\n'
             '   "0o377" produce a "DeprecationWarning". In a future Python '
             'version\n'
             '   they will be a "SyntaxWarning" and eventually a '
             '"SyntaxError".\n'
             '\n'
-            '2. Unlike in Standard C, exactly two hex digits are required.\n'
+            '3. Unlike in Standard C, exactly two hex digits are required.\n'
             '\n'
-            '3. In a bytes literal, hexadecimal and octal escapes denote the '
+            '4. In a bytes literal, hexadecimal and octal escapes denote the '
             'byte\n'
             '   with the given value. In a string literal, these escapes '
             'denote a\n'
             '   Unicode character with the given value.\n'
             '\n'
-            '4. Changed in version 3.3: Support for name aliases [1] has been\n'
+            '5. Changed in version 3.3: Support for name aliases [1] has been\n'
             '   added.\n'
             '\n'
-            '5. Exactly four hex digits are required.\n'
+            '6. Exactly four hex digits are required.\n'
             '\n'
-            '6. Any Unicode character can be encoded this way.  Exactly eight '
+            '7. Any Unicode character can be encoded this way.  Exactly eight '
             'hex\n'
             '   digits are required.\n'
             '\n'