diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-04-06 17:06:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-04-06 17:06:21 (GMT) |
| commit | 7d71c97ec3f4c8f37c81e57a35d53114a6344932 (patch) | |
| tree | ec7b3bb99cb4e762fba6ff176dcc908d545010dc | |
| parent | 55c14355ac66498814265ceacf2bbddc89c5597b (diff) | |
| parent | 43b842775fc9be203754f1dceb39607f28e06256 (diff) | |
| download | cpython-7d71c97ec3f4c8f37c81e57a35d53114a6344932.zip cpython-7d71c97ec3f4c8f37c81e57a35d53114a6344932.tar.gz cpython-7d71c97ec3f4c8f37c81e57a35d53114a6344932.tar.bz2 | |
merge 3.4 (#23875)
| -rw-r--r-- | Modules/_ssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index aed4ac0..bb838b0 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -4047,7 +4047,7 @@ PySSL_enum_certificates(PyObject *self, PyObject *args, PyObject *kwds) PyObject *keyusage = NULL, *cert = NULL, *enc = NULL, *tup = NULL; PyObject *result = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|s:enum_certificates", + if (!PyArg_ParseTupleAndKeywords(args, kwds, "s:enum_certificates", kwlist, &store_name)) { return NULL; } @@ -4135,7 +4135,7 @@ PySSL_enum_crls(PyObject *self, PyObject *args, PyObject *kwds) PyObject *crl = NULL, *enc = NULL, *tup = NULL; PyObject *result = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|s:enum_crls", + if (!PyArg_ParseTupleAndKeywords(args, kwds, "s:enum_crls", kwlist, &store_name)) { return NULL; } |