vgetargskeywords(): remove test that can't succeed. Not a bugfix, just

removing useless obfuscation.

diff --git a/Python/getargs.c b/Python/getargs.c
index 6593a82fb7f3ccecc618fb87a5eecd433319efb7..557389ba0ccee30d50ac86140f20038730d01328 100644 (file)
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1028,9 +1028,9 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
        char *msg, *ks, **p;
        int nkwds, pos, match, converted;
        PyObject *key, *value;
-       
+
        /* nested tuples cannot be parsed when using keyword arguments */
-       
+
        for (;;) {
                int c = *format++;
                if (c == '(') {
@@ -1068,23 +1068,17 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
        tplen = PyTuple_GET_SIZE(args);
        
        /* do a cursory check of the keywords just to see how many we got */
-          
+
+       kwlen = 0;
        if (keywords) {         
                if (!PyDict_Check(keywords)) {
-                       if (keywords == NULL)
-                               PyErr_SetString(PyExc_SystemError,
-                    "NULL received when keyword dictionary expected");
-                       else
-                               PyErr_Format(PyExc_SystemError,
-                    "%s received when keyword dictionary expected",
-                                            keywords->ob_type->tp_name);
+                       PyErr_Format(PyExc_SystemError,
+                               "%s received when keyword dictionary expected",
+                               keywords->ob_type->tp_name);
                        return 0;
                }       
                kwlen = PyDict_Size(keywords);
        }
-       else {
-               kwlen = 0;
-       }
                        
        /* make sure there are no duplicate values for an argument;
           its not clear when to use the term "keyword argument vs.