ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify return value of ssl.get_default_verify_paths

Browse source 
prefix function with PySSL_, too. Other module level functions have a prefix, too.
This commit is contained in:
Christian Heimes 2013-06-14 15:14:29 +02:00
parent 13728a57c8
commit 200bb1b08c
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/_ssl.c
View file

@ -2769,13 +2769,12 @@ set_default_verify_paths() to load default CAs. The values are\n\
'cert_file_env', 'cert_file', 'cert_dir_env', 'cert_dir'.");
static PyObject *
get_default_verify_paths(PyObject *self)
PySSL_get_default_verify_paths(PyObject *self)
{
PyObject *ofile_env = NULL;
PyObject *ofile = NULL;
PyObject *odir_env = NULL;
PyObject *odir = NULL;
PyObject *tup = NULL;
#define convert(info, target) { \
const char *tmp = (info); \
@ -2792,14 +2791,7 @@ get_default_verify_paths(PyObject *self)
convert(X509_get_default_cert_dir(), odir);
#undef convert
if ((tup = PyTuple_New(4)) == NULL) {
goto error;
}
PyTuple_SET_ITEM(tup, 0, ofile_env);
PyTuple_SET_ITEM(tup, 1, ofile);
PyTuple_SET_ITEM(tup, 2, odir_env);
PyTuple_SET_ITEM(tup, 3, odir);
return tup;
return Py_BuildValue("NNNN", ofile_env, ofile, odir_env, odir);
error:
Py_XDECREF(ofile_env);
@ -2950,7 +2942,7 @@ static PyMethodDef PySSL_methods[] = {
{"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
PySSL_RAND_status_doc},
#endif
{"get_default_verify_paths", (PyCFunction)get_default_verify_paths,
{"get_default_verify_paths", (PyCFunction)PySSL_get_default_verify_paths,
METH_NOARGS, PySSL_get_default_verify_paths_doc},
#ifdef _MSC_VER
{"enum_cert_store", (PyCFunction)PySSL_enum_cert_store,