From da9c8c36aeb60ad8f7748a735c372bf993d2e4f3 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 24 Nov 2017 22:06:38 +0100 Subject: bpo-32125: Remove Py_UseClassExceptionsFlag flag (#4544) This flag was deprecated and wasn't used anymore since Python 2.0. --- Include/pydebug.h | 1 - Misc/NEWS.d/next/C API/2017-11-24-21-25-43.bpo-32125.K8zWgn.rst | 2 ++ Python/pylifecycle.c | 1 - Tools/c-globals/ignored-globals.txt | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/C API/2017-11-24-21-25-43.bpo-32125.K8zWgn.rst diff --git a/Include/pydebug.h b/Include/pydebug.h index d3b9596..bd4aafe 100644 --- a/Include/pydebug.h +++ b/Include/pydebug.h @@ -15,7 +15,6 @@ PyAPI_DATA(int) Py_InspectFlag; PyAPI_DATA(int) Py_OptimizeFlag; PyAPI_DATA(int) Py_NoSiteFlag; PyAPI_DATA(int) Py_BytesWarningFlag; -PyAPI_DATA(int) Py_UseClassExceptionsFlag; PyAPI_DATA(int) Py_FrozenFlag; PyAPI_DATA(int) Py_IgnoreEnvironmentFlag; PyAPI_DATA(int) Py_DontWriteBytecodeFlag; diff --git a/Misc/NEWS.d/next/C API/2017-11-24-21-25-43.bpo-32125.K8zWgn.rst b/Misc/NEWS.d/next/C API/2017-11-24-21-25-43.bpo-32125.K8zWgn.rst new file mode 100644 index 0000000..d71c664 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2017-11-24-21-25-43.bpo-32125.K8zWgn.rst @@ -0,0 +1,2 @@ +The ``Py_UseClassExceptionsFlag`` flag has been removed. It was deprecated +and wasn't used anymore since Python 2.0. diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 8d2ec4e..b079990 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -116,7 +116,6 @@ int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */ int Py_OptimizeFlag = 0; /* Needed by compile.c */ int Py_NoSiteFlag; /* Suppress 'import site' */ int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */ -int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */ int Py_FrozenFlag; /* Needed by getpath.c */ int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */ int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.pyc) */ diff --git a/Tools/c-globals/ignored-globals.txt b/Tools/c-globals/ignored-globals.txt index 7b5add8..ce6d1d8 100644 --- a/Tools/c-globals/ignored-globals.txt +++ b/Tools/c-globals/ignored-globals.txt @@ -393,7 +393,6 @@ Py_NoUserSiteDirectory Py_OptimizeFlag Py_QuietFlag Py_UnbufferedStdioFlag -Py_UseClassExceptionsFlag Py_VerboseFlag -- cgit v0.12