Merge python#3

bors[bot] · nanjekyejoannah · web-flow · commit b286d7227edc · 2022-06-02T12:11:17.000Z
3: Add Py2x flag r=ltratt a=nanjekyejoannah

This PR adds the Py2x flag:

```
Python 3.12.0a0 (heads/migration-dirty:5842fee697, May 23 2022, 00:25:04) [Clang 12.0.0 (clang-1200.0.32.29)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
&gt;&gt;&gt; import sys
&gt;&gt;&gt; sys.flags
sys.flags(debug=0, inspect=0, interactive=0, optimize=0, dont_write_bytecode=0, no_user_site=0, no_site=0, ignore_environment=0, verbose=0, bytes_warning=0, py2x_warning=1, quiet=0, hash_randomization=1, isolated=0, dev_mode=False, utf8_mode=0, warn_default_encoding=0)
&gt;&gt;&gt; 
```

Co-authored-by: Joannah Nanjekye &lt;jnanjekye@python.org&gt;
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
@@ -1083,6 +1083,7 @@ the variables:
    single: PyExc_SyntaxWarning
    single: PyExc_UnicodeWarning
    single: PyExc_UserWarning
+   single: PyExc_Py2xWarning
 
 +------------------------------------------+---------------------------------+----------+
 | C Name                                   | Python Name                     | Notes    |
@@ -1091,6 +1092,8 @@ the variables:
 +------------------------------------------+---------------------------------+----------+
 | :c:data:`PyExc_BytesWarning`             | :exc:`BytesWarning`             |          |
 +------------------------------------------+---------------------------------+----------+
+| :c:data:`PyExc_Py2xWarning`              | :exc:`Py2xWarning`              |          |
++------------------------------------------+---------------------------------+----------+
 | :c:data:`PyExc_DeprecationWarning`       | :exc:`DeprecationWarning`       |          |
 +------------------------------------------+---------------------------------+----------+
 | :c:data:`PyExc_FutureWarning`            | :exc:`FutureWarning`            |          |
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
@@ -89,6 +89,12 @@ to 1 and ``-bb`` sets :c:data:`Py_BytesWarningFlag` to 2.
 
    Set by the :option:`-b` option.
 
+.. c:var:: int Py_Py2xWarningFlag
+
+   Issue a warning regarding 3.x compatibility.
+
+   Set by the :option:`-2` option.
+
 .. c:var:: int Py_DebugFlag
 
    Turn on parser debugging output (for expert only, depending on compilation
diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst
@@ -617,6 +617,14 @@ PyConfig
 
       Default: ``0``.
 
+   .. c:member:: int py2x_warning
+
+      If equals to ``1``, issue a warning for 3.x compatibility.
+
+      Incremented by the :option:`-2` command line option.
+
+      Default: ``0``.
+
    .. c:member:: int warn_default_encoding
 
       If non-zero, emit a :exc:`EncodingWarning` warning when :class:`io.TextIOWrapper`
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
@@ -855,6 +855,10 @@ The following exceptions are used as warning categories; see the
 
    Base class for warnings related to :class:`bytes` and :class:`bytearray`.
 
+.. exception:: Py2xWarning
+
+   Base class for warnings related to 3.x compatibility.
+
 
 .. exception:: ResourceWarning
 
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
@@ -516,6 +516,7 @@ always available.
    :const:`ignore_environment`   :option:`-E`
    :const:`verbose`              :option:`-v`
    :const:`bytes_warning`        :option:`-b`
+   :const:`py2x_warning`         :option:`-2`
    :const:`quiet`                :option:`-q`
    :const:`hash_randomization`   :option:`-R`
    :const:`dev_mode`             :option:`-X dev <-X>` (:ref:`Python Development Mode <devmode>`)
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
@@ -104,6 +104,9 @@ The following warnings category classes are currently defined:
 | :exc:`BytesWarning`              | Base category for warnings related to         |
 |                                  | :class:`bytes` and :class:`bytearray`.        |
 +----------------------------------+-----------------------------------------------+
+| :exc:`Py2xWarning`               | Base category for warnings related to         |
+|                                  | 3.x compatibility.                            |
++----------------------------------+-----------------------------------------------+
 | :exc:`ResourceWarning`           | Base category for warnings related to         |
 |                                  | resource usage (ignored by default).          |
 +----------------------------------+-----------------------------------------------+
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h
@@ -158,6 +158,7 @@ typedef struct PyConfig {
     PyWideStringList warnoptions;
     int site_import;
     int bytes_warning;
+    int py2x_warning;
     int warn_default_encoding;
     int inspect;
     int interactive;
diff --git a/Include/cpython/pydebug.h b/Include/cpython/pydebug.h
@@ -20,6 +20,7 @@ PyAPI_DATA(int) Py_NoUserSiteDirectory;
 PyAPI_DATA(int) Py_UnbufferedStdioFlag;
 PyAPI_DATA(int) Py_HashRandomizationFlag;
 PyAPI_DATA(int) Py_IsolatedFlag;
+PyAPI_DATA(int) Py_Py2xWarningFlag;
 
 #ifdef MS_WINDOWS
 PyAPI_DATA(int) Py_LegacyWindowsFSEncodingFlag;
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
@@ -155,6 +155,7 @@ PyAPI_DATA(PyObject *) PyExc_UnicodeWarning;
 PyAPI_DATA(PyObject *) PyExc_BytesWarning;
 PyAPI_DATA(PyObject *) PyExc_EncodingWarning;
 PyAPI_DATA(PyObject *) PyExc_ResourceWarning;
+PyAPI_DATA(PyObject *) PyExc_Py2xWarning;
 
 
 /* Convenience functions */
diff --git a/Lib/compileall.py b/Lib/compileall.py
@@ -375,6 +375,8 @@ def main():
     parser.add_argument('--hardlink-dupes', action='store_true',
                         dest='hardlink_dupes',
                         help='Hardlink duplicated pyc files')
+    parser.add_argument('-2', dest='py2x', action='store_true',
+                       help='show warnings for 3.x compatibility')
 
     args = parser.parse_args()
     compile_dests = args.compile_dest
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
@@ -298,6 +298,7 @@ def _args_from_interpreter_flags():
         'verbose': 'v',
         'bytes_warning': 'b',
         'quiet': 'q',
+        'py2x_warning': '2',
         # -O is handled in _optim_args_from_interpreter_flags()
     }
     args = _optim_args_from_interpreter_flags()
diff --git a/Lib/test/_test_embed_set_config.py b/Lib/test/_test_embed_set_config.py
@@ -69,6 +69,7 @@ def test_set_invalid(self):
             'parse_argv',
             'site_import',
             'bytes_warning',
+            'py2x_warning',
             'inspect',
             'interactive',
             'optimization_level',
@@ -158,6 +159,7 @@ def test_flags(self):
             ("bytes_warning", "bytes_warning", 10),
             ("quiet", "quiet", 11),
             ("isolated", "isolated", 12),
+            ("py2x_warning", "py2x_warning", 13),
         ):
             with self.subTest(sys=sys_attr, key=key, value=value):
                 self.set_config(**{key: value, 'parse_argv': 0})
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
@@ -3965,7 +3965,7 @@ def test_shared_memory_recreate(self):
             'multiprocessing.shared_memory._make_filename') as mock_make_filename:
 
             NAME_PREFIX = shared_memory._SHM_NAME_PREFIX
-            names = ['test01_fn', 'test02_fn']
+            names = ['test03_fn', 'test09_fn']
             # Prepend NAME_PREFIX which can be '/psm_' or 'wnsm_', necessary
             # because some POSIX compliant systems require name to start with /
             names = [NAME_PREFIX + name for name in names]
diff --git a/Lib/test/exception_hierarchy.txt b/Lib/test/exception_hierarchy.txt
@@ -55,6 +55,7 @@ BaseException
       │         └── UnicodeTranslateError
       └── Warning
            ├── BytesWarning
+           ├── Py2xWarning
            ├── DeprecationWarning
            ├── EncodingWarning
            ├── FutureWarning
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py
@@ -316,6 +316,8 @@ def _create_parser():
                        help='override the working directory for the test run')
     group.add_argument('--cleanup', action='store_true',
                        help='remove old test_python_* directories')
+    group.add_argument('-2', dest='py2x', action='store_true',
+                       help='show warnings for 3.x compatibility')
     return parser
 
 
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -473,6 +473,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
 
         'site_import': 1,
         'bytes_warning': 0,
+        'py2x_warning': 0,
         'warn_default_encoding': 0,
         'inspect': 0,
         'interactive': 0,
@@ -541,6 +542,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
         # Copy core config to global config for expected values
         # True means that the core config value is inverted (0 => 1 and 1 => 0)
         ('Py_BytesWarningFlag', 'bytes_warning'),
+        ('Py_Py2xWarningFlag', 'py2x_warning'),
         ('Py_DebugFlag', 'parser_debug'),
         ('Py_DontWriteBytecodeFlag', 'write_bytecode', True),
         ('Py_FileSystemDefaultEncodeErrors', 'filesystem_errors'),
@@ -809,6 +811,7 @@ def test_init_global_config(self):
             'program_name': './globalvar',
             'site_import': 0,
             'bytes_warning': 1,
+            'py2x_warning': 1,
             'warnoptions': ['default::BytesWarning'],
             'inspect': 1,
             'interactive': 1,
@@ -865,6 +868,7 @@ def test_init_from_config(self):
 
             'site_import': 0,
             'bytes_warning': 1,
+            'py2x_warning': 1,
             'inspect': 1,
             'interactive': 1,
             'optimization_level': 2,
@@ -1542,6 +1546,7 @@ def test_init_warnoptions(self):
             'dev_mode': 1,
             'faulthandler': 1,
             'bytes_warning': 1,
+            'py2x_warning': 1,
             'warnoptions': warnoptions,
             'orig_argv': ['python3',
                           '-Wignore:::cmdline1',
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
@@ -491,7 +491,8 @@ def test_exceptions(self):
                            RecursionError,
                            EncodingWarning,
                            BaseExceptionGroup,
-                           ExceptionGroup):
+                           ExceptionGroup,
+                           Py2xWarning):
                     continue
                 if exc is not OSError and issubclass(exc, OSError):
                     self.assertEqual(reverse_mapping('builtins', name),
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -672,7 +672,7 @@ def test_sys_flags(self):
                  "warn_default_encoding", "safe_path")
         for attr in attrs:
             self.assertTrue(hasattr(sys.flags, attr), attr)
-            attr_type = bool if attr in ("dev_mode", "safe_path") else int
+            attr_type = bool if attr in ("dev_mode", "py2x_warning", "safe_path") else int
             self.assertEqual(type(getattr(sys.flags, attr)), attr_type, attr)
         self.assertTrue(repr(sys.flags))
         self.assertEqual(len(sys.flags), len(attrs))
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -3386,6 +3386,12 @@ SimpleExtendsException(PyExc_Warning, BytesWarning,
     "Base class for warnings about bytes and buffer related problems, mostly\n"
     "related to conversion from str or comparing to str.");
 
+/*
+ *    BytesWarning extends Warning
+ */
+SimpleExtendsException(PyExc_Warning, Py2xWarning,
+    "Base class for warnings about 3.x compatibility.");
+
 
 /*
  *    EncodingWarning extends Warning
@@ -3504,6 +3510,7 @@ static struct static_exception static_exceptions[] = {
 
     // Level 4: Warning(Exception) subclasses
     ITEM(BytesWarning),
+    ITEM(Py2xWarning),
     ITEM(DeprecationWarning),
     ITEM(EncodingWarning),
     ITEM(FutureWarning),
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
@@ -1121,7 +1121,7 @@ get_native_fmtchar(char *result, const char *fmt)
     if (fmt[0] == '@') fmt++;
 
     switch (fmt[0]) {
-    case 'c': case 'b': case 'B': size = sizeof(char); break;
+    case 'c': case '2': case 'b': case 'B': size = sizeof(char); break;
     case 'h': case 'H': size = sizeof(short); break;
     case 'i': case 'I': size = sizeof(int); break;
     case 'l': case 'L': size = sizeof(long); break;
@@ -1159,6 +1159,7 @@ get_native_fmtstr(const char *fmt)
     switch (fmt[0]) {
     case 'c': RETURN("c");
     case 'b': RETURN("b");
+    case '2': RETURN("2");
     case 'B': RETURN("B");
     case 'h': RETURN("h");
     case 'H': RETURN("H");
diff --git a/PC/python3dll.c b/PC/python3dll.c
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
@@ -494,6 +494,7 @@ static int test_init_global_config(void)
     /* Py_IsolatedFlag is not tested */
     Py_NoSiteFlag = 1;
     Py_BytesWarningFlag = 1;
+    Py_Py2xWarningFlag = 1;
 
     putenv("PYTHONINSPECT=");
     Py_InspectFlag = 1;
@@ -631,6 +632,9 @@ static int test_init_from_config(void)
     Py_BytesWarningFlag = 0;
     config.bytes_warning = 1;
 
+    Py_Py2xWarningFlag = 0;
+    config.py2x_warning = 1;
+
     putenv("PYTHONINSPECT=");
     Py_InspectFlag = 0;
     config.inspect = 1;
@@ -960,6 +964,7 @@ static void set_all_global_config_variables(void)
     Py_IsolatedFlag = 0;
     Py_IgnoreEnvironmentFlag = 0;
     Py_BytesWarningFlag = 2;
+    Py_Py2xWarningFlag = 1;
     Py_InspectFlag = 1;
     Py_InteractiveFlag = 1;
     Py_OptimizeFlag = 1;
@@ -1562,6 +1567,7 @@ static int test_init_warnoptions(void)
 
     config.dev_mode = 1;
     config.bytes_warning = 1;
+    config.py2x_warning = 1;
 
     config_set_program_name(&config);
 
diff --git a/Python/getargs.c b/Python/getargs.c
@@ -702,6 +702,17 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
         break;
     }
 
+    case '2': {/* byte sized bitfield - both signed and unsigned
+                  values allowed */
+        char *p = va_arg(*p_va, char *);
+        unsigned long ival = PyLong_AsUnsignedLongMask(arg);
+        if (ival == (unsigned long)-1 && PyErr_Occurred())
+            RETURN_ERR_OCCURRED;
+        else
+            *p = (unsigned char) ival;
+        break;
+    }
+
     case 'h': {/* signed short int */
         short *p = va_arg(*p_va, short *);
         long ival = PyLong_AsLong(arg);
@@ -2606,6 +2617,7 @@ skipitem(const char **p_format, va_list *p_va, int flags)
     case 'c': /* char */
     case 'C': /* unicode char */
     case 'p': /* boolean predicate */
+    case '2': /* boolean predicate */
     case 'S': /* string object */
     case 'Y': /* string object */
     case 'U': /* unicode string object */
diff --git a/Python/getopt.c b/Python/getopt.c
@@ -41,7 +41,7 @@ static const wchar_t *opt_ptr = L"";
 
 /* Python command line short and long options */
 
-#define SHORT_OPTS L"bBc:dEhiIJm:OPqRsStuvVW:xX:?"
+#define SHORT_OPTS L"b2Bc:dEhiIJm:OPqRsStuvVW:xX:?"
 
 static const _PyOS_LongOption longopts[] = {
     {L"check-hash-based-pycs", 1, 0},
diff --git a/Python/initconfig.c b/Python/initconfig.c
diff --git a/Python/modsupport.c b/Python/modsupport.c
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
diff --git a/Tools/c-analyzer/TODO b/Tools/c-analyzer/TODO
diff --git a/Tools/c-analyzer/cpython/globals-to-fix.tsv b/Tools/c-analyzer/cpython/globals-to-fix.tsv
