[Python-checkins] cpython: Simplify return value of ssl.get_default_verify_paths
christian.heimes
python-checkins at python.org
Fri Jun 14 15:14:38 CEST 2013
http://hg.python.org/cpython/rev/5f7e12eb65b8
changeset: 84119:5f7e12eb65b8
user: Christian Heimes <christian at cheimes.de>
date: Fri Jun 14 15:14:29 2013 +0200
summary:
Simplify return value of ssl.get_default_verify_paths
prefix function with PySSL_, too. Other module level functions have a prefix, too.
files:
Modules/_ssl.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2769,13 +2769,12 @@
'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 @@
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 @@
{"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,
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list