Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.5 (#24655)

This commit is contained in:
Benjamin Peterson 2015-07-18 11:00:19 -07:00
parent 7066cd7d54 0544cf0eb9
commit d830b9d319
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/_ssl.c
View File

@ -3963,20 +3963,20 @@ _ssl_get_default_verify_paths_impl(PyModuleDef *module)
PyObject *odir_env = NULL;
PyObject *odir = NULL;
#define convert(info, target) { \
#define CONVERT(info, target) { \
const char *tmp = (info); \
target = NULL; \
if (!tmp) { Py_INCREF(Py_None); target = Py_None; } \
else if ((target = PyUnicode_DecodeFSDefault(tmp)) == NULL) { \
target = PyBytes_FromString(tmp); } \
if (!target) goto error; \
} while(0)
}
convert(X509_get_default_cert_file_env(), ofile_env);
convert(X509_get_default_cert_file(), ofile);
convert(X509_get_default_cert_dir_env(), odir_env);
convert(X509_get_default_cert_dir(), odir);
#undef convert
CONVERT(X509_get_default_cert_file_env(), ofile_env);
CONVERT(X509_get_default_cert_file(), ofile);
CONVERT(X509_get_default_cert_dir_env(), odir_env);
CONVERT(X509_get_default_cert_dir(), odir);
#undef CONVERT
return Py_BuildValue("NNNN", ofile_env, ofile, odir_env, odir);