diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-05-14 15:34:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 15:34:56 (GMT) |
| commit | c96be811fa7da8ddcea18cc7abcae94e0f5ff966 (patch) | |
| tree | f3c6833ba92a084dc604498aecef6ef9103d6dfa /Objects/bytesobject.c | |
| parent | 3c93153f7db5dd9b06f229e61978fd9199b3c097 (diff) | |
| download | cpython-c96be811fa7da8ddcea18cc7abcae94e0f5ff966.zip cpython-c96be811fa7da8ddcea18cc7abcae94e0f5ff966.tar.gz cpython-c96be811fa7da8ddcea18cc7abcae94e0f5ff966.tar.bz2 | |
bpo-36900: Replace global conf vars with config (GH-13299)
Replace global configuration variables with core_config read from the
current interpreter.
Cleanup dynload_hpux.c.
Diffstat (limited to 'Objects/bytesobject.c')
| -rw-r--r-- | Objects/bytesobject.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 0b46cee..b7c5b75 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -1421,7 +1421,8 @@ bytes_repr(PyObject *op) static PyObject * bytes_str(PyObject *op) { - if (Py_BytesWarningFlag) { + _PyCoreConfig *config = &_PyInterpreterState_GET_UNSAFE()->core_config; + if (config->bytes_warning) { if (PyErr_WarnEx(PyExc_BytesWarning, "str() on a bytes instance", 1)) { return NULL; @@ -1578,7 +1579,8 @@ bytes_richcompare(PyBytesObject *a, PyBytesObject *b, int op) /* Make sure both arguments are strings. */ if (!(PyBytes_Check(a) && PyBytes_Check(b))) { - if (Py_BytesWarningFlag && (op == Py_EQ || op == Py_NE)) { + _PyCoreConfig *config = &_PyInterpreterState_GET_UNSAFE()->core_config; + if (config->bytes_warning && (op == Py_EQ || op == Py_NE)) { rc = PyObject_IsInstance((PyObject*)a, (PyObject*)&PyUnicode_Type); if (!rc) |