Skip to content

Commit

Permalink
gh-100062: Remove error code tables from _ssl and err_names_to_codes (G…
Browse files Browse the repository at this point in the history
…H-100063)

Prior to #25300, the
make_ssl_data.py script used various tables, exposed in _ssl, to update
the error list.

After that PR, this is no longer used. Moreover, the err_names_to_codes
map isn't used at all. Clean those up. This gets them out of the way if,
in the future, OpenSSL provides an API to do what the code here is doing
directly. (openssl/openssl#19848)
  • Loading branch information
davidben authored Apr 3, 2023
1 parent 5ffc1e5 commit 02f9920
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
14 changes: 0 additions & 14 deletions Modules/_ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -5991,9 +5991,6 @@ sslmodule_init_errorcodes(PyObject *module)
state->err_codes_to_names = PyDict_New();
if (state->err_codes_to_names == NULL)
return -1;
state->err_names_to_codes = PyDict_New();
if (state->err_names_to_codes == NULL)
return -1;
state->lib_codes_to_names = PyDict_New();
if (state->lib_codes_to_names == NULL)
return -1;
Expand All @@ -6007,8 +6004,6 @@ sslmodule_init_errorcodes(PyObject *module)
return -1;
if (PyDict_SetItem(state->err_codes_to_names, key, mnemo))
return -1;
if (PyDict_SetItem(state->err_names_to_codes, mnemo, key))
return -1;
Py_DECREF(key);
Py_DECREF(mnemo);
errcode++;
Expand All @@ -6028,13 +6023,6 @@ sslmodule_init_errorcodes(PyObject *module)
libcode++;
}

if (PyModule_AddObjectRef(module, "err_codes_to_names", state->err_codes_to_names))
return -1;
if (PyModule_AddObjectRef(module, "err_names_to_codes", state->err_names_to_codes))
return -1;
if (PyModule_AddObjectRef(module, "lib_codes_to_names", state->lib_codes_to_names))
return -1;

return 0;
}

Expand Down Expand Up @@ -6189,7 +6177,6 @@ sslmodule_traverse(PyObject *m, visitproc visit, void *arg)
Py_VISIT(state->PySSLSyscallErrorObject);
Py_VISIT(state->PySSLEOFErrorObject);
Py_VISIT(state->err_codes_to_names);
Py_VISIT(state->err_names_to_codes);
Py_VISIT(state->lib_codes_to_names);
Py_VISIT(state->Sock_Type);

Expand All @@ -6214,7 +6201,6 @@ sslmodule_clear(PyObject *m)
Py_CLEAR(state->PySSLSyscallErrorObject);
Py_CLEAR(state->PySSLEOFErrorObject);
Py_CLEAR(state->err_codes_to_names);
Py_CLEAR(state->err_names_to_codes);
Py_CLEAR(state->lib_codes_to_names);
Py_CLEAR(state->Sock_Type);
Py_CLEAR(state->str_library);
Expand Down
1 change: 0 additions & 1 deletion Modules/_ssl.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ typedef struct {
PyObject *PySSLEOFErrorObject;
/* Error mappings */
PyObject *err_codes_to_names;
PyObject *err_names_to_codes;
PyObject *lib_codes_to_names;
/* socket type from module CAPI */
PyTypeObject *Sock_Type;
Expand Down

0 comments on commit 02f9920

Please sign in to comment.