[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#23875)

[benjamin.peterson]

https://hg.python.org/cpython/rev/c9b9fb86d3fa
changeset:   95454:c9b9fb86d3fa
parent:      95451:29f51c4ae11a
parent:      95452:e0ba8d3bed7e
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Apr 06 13:06:21 2015 -0400
summary:
  merge 3.4 (#23875)

files:
  Modules/_ssl.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4047,7 +4047,7 @@
     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 @@
     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;
     }

-- 
Repository URL: https://hg.python.org/cpython