rpms/python3.6
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 3.6.11rc1

Browse source
This commit is contained in:
Petr Viktorin 2020-06-19 20:54:46 +02:00
commit 869be1a27a
18 changed files with 495 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

34
00292-restore-PyExc_RecursionErrorInst-symbol.patch
View file

@ -1,5 +1,19 @@
From 350592aecc1c62c4f4ef9f8ebc3394095c974c00 Mon Sep 17 00:00:00 2001
From: Charalampos Stratakis <cstratak@redhat.com>
Date: Fri, 19 Jun 2020 17:06:08 +0200
Subject: [PATCH] 00292: Restore PyExc_RecursionErrorInst symbol
Restore the public PyExc_RecursionErrorInst symbol that was removed
from the 3.6.4 release upstream.
Reported upstream: https://bugs.python.org/issue30697
---
Include/pyerrors.h | 2 ++
Objects/exceptions.c | 32 ++++++++++++++++++++++++++++++++
PC/python3.def | 1 +
3 files changed, 35 insertions(+)
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index c28c1373f82..8c1dbc5047b 100644
index 44f20303c2..8b5c2748de 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -219,6 +219,8 @@ PyAPI_DATA(PyObject *) PyExc_IOError;
@ -11,18 +25,11 @@ index c28c1373f82..8c1dbc5047b 100644
/* Predefined warning categories */
PyAPI_DATA(PyObject *) PyExc_Warning;
PyAPI_DATA(PyObject *) PyExc_UserWarning;
diff --git a/Misc/NEWS.d/next/C API/2017-12-20-15-23-06.bpo-30697.v9FmgG.rst b/Misc/NEWS.d/next/C API/2017-12-20-15-23-06.bpo-30697.v9FmgG.rst
new file mode 100644
index 00000000000..28f74ad4f30
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2017-12-20-15-23-06.bpo-30697.v9FmgG.rst
@@ -0,0 +1 @@
+Restore PyExc_RecursionErrorInst in 3.6
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index df4899372a5..271e293e325 100644
index 6f3b986d32..76bb1a4697 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -2430,6 +2430,12 @@ SimpleExtendsException(PyExc_Warning, ResourceWarning,
@@ -2434,6 +2434,12 @@ SimpleExtendsException(PyExc_Warning, ResourceWarning,
@ -35,7 +42,7 @@ index df4899372a5..271e293e325 100644
#define PRE_INIT(TYPE) \
if (!(_PyExc_ ## TYPE.tp_flags & Py_TPFLAGS_READY)) { \
if (PyType_Ready(&_PyExc_ ## TYPE) < 0) \
@@ -2691,11 +2697,37 @@ _PyExc_Init(PyObject *bltinmod)
@@ -2695,11 +2701,37 @@ _PyExc_Init(PyObject *bltinmod)
ADD_ERRNO(TimeoutError, ETIMEDOUT);
preallocate_memerrors();
@ -74,7 +81,7 @@ index df4899372a5..271e293e325 100644
Py_CLEAR(errnomap);
}
diff --git a/PC/python3.def b/PC/python3.def
index 4fc4a6814ee..ff70718fc37 100644
index 4fc4a6814e..ff70718fc3 100644
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -224,6 +224,7 @@ EXPORTS
@ -85,3 +92,6 @@ index 4fc4a6814ee..ff70718fc37 100644
PyExc_ReferenceError=python36.PyExc_ReferenceError DATA
PyExc_ResourceWarning=python36.PyExc_ResourceWarning DATA
PyExc_RuntimeError=python36.PyExc_RuntimeError DATA
--
2.26.2