From: Stefan Behnel <scoder@users.berlios.de>
Date: Wed, 14 May 2008 23:10:13 +0000 (+0200)
Subject: fixes for keyword arg checking
X-Git-Tag: 0.9.8rc1~37^2~71
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3588f89c464f442217a8309f89dd5278f0dec577;p=cython.git

fixes for keyword arg checking
---

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index d169157b..878d9855 100644
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -4000,7 +4000,11 @@ static int __Pyx_CheckKeywordStrings(
     PyObject* key = 0;
     Py_ssize_t pos = 0;
     while (PyDict_Next(kwdict, &pos, &key, 0)) {
+        #if PY_MAJOR_VERSION < 3
         if (unlikely(!PyString_Check(key))) {
+        #else
+        if (unlikely(!PyUnicode_Check(key))) {
+        #endif
             PyErr_Format(PyExc_TypeError,
                          "%s() keywords must be strings", function_name);
             return 0;
@@ -4009,7 +4013,11 @@ static int __Pyx_CheckKeywordStrings(
     if (unlikely(!kw_allowed) && unlikely(key)) {
         PyErr_Format(PyExc_TypeError,
                      "'%s' is an invalid keyword argument for this function",
+        #if PY_MAJOR_VERSION < 3
                      PyString_AsString(key));
+        #else
+                     PyUnicode_AsString(key));
+        #endif
         return 0;
     }
     return 1;