mirror of
https://github.com/python/cpython.git
synced 2025-12-04 00:30:19 +00:00
bpo-40268: Add _PyInterpreterState_GetConfig() (GH-19492)
Don't access PyInterpreterState.config member directly anymore, but use new functions: * _PyInterpreterState_GetConfig() * _PyInterpreterState_SetConfig() * _Py_GetConfig()
This commit is contained in:
parent
14d5331eb5
commit
da7933ecc3
19 changed files with 90 additions and 64 deletions
|
|
@ -6,7 +6,6 @@
|
|||
#include "pycore_bytes_methods.h"
|
||||
#include "pycore_object.h"
|
||||
#include "pycore_pymem.h"
|
||||
#include "pycore_pystate.h"
|
||||
#include "structmember.h"
|
||||
#include "bytesobject.h"
|
||||
#include "pystrhex.h"
|
||||
|
|
@ -997,8 +996,7 @@ bytearray_repr(PyByteArrayObject *self)
|
|||
static PyObject *
|
||||
bytearray_str(PyObject *op)
|
||||
{
|
||||
PyConfig *config = &_PyInterpreterState_GET_UNSAFE()->config;
|
||||
if (config->bytes_warning) {
|
||||
if (_Py_GetConfig()->bytes_warning) {
|
||||
if (PyErr_WarnEx(PyExc_BytesWarning,
|
||||
"str() on a bytearray instance", 1)) {
|
||||
return NULL;
|
||||
|
|
@ -1023,8 +1021,7 @@ bytearray_richcompare(PyObject *self, PyObject *other, int op)
|
|||
if (rc < 0)
|
||||
return NULL;
|
||||
if (rc) {
|
||||
PyConfig *config = &_PyInterpreterState_GET_UNSAFE()->config;
|
||||
if (config->bytes_warning && (op == Py_EQ || op == Py_NE)) {
|
||||
if (_Py_GetConfig()->bytes_warning && (op == Py_EQ || op == Py_NE)) {
|
||||
if (PyErr_WarnEx(PyExc_BytesWarning,
|
||||
"Comparison between bytearray and string", 1))
|
||||
return NULL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue