]> granicus.if.org Git - python/commitdiff
Port GetInteger and GetString to 3k.
authorMartin v. Löwis <martin@v.loewis.de>
Mon, 2 Jun 2008 11:32:23 +0000 (11:32 +0000)
committerMartin v. Löwis <martin@v.loewis.de>
Mon, 2 Jun 2008 11:32:23 +0000 (11:32 +0000)
PC/_msi.c

index d3727760a561a1975e669719d88ebc7558b372ec..6c6f2f82ff31439eb2454a96c1f399004206e761 100644 (file)
--- a/PC/_msi.c
+++ b/PC/_msi.c
@@ -351,7 +351,7 @@ record_getinteger(msiobj* record, PyObject* args)
         PyErr_SetString(MSIError, "could not convert record field to integer");
         return NULL;
     }
-    return PyInt_FromLong((long) status);
+    return PyLong_FromLong((long) status);
 }
 
 static PyObject*
@@ -375,7 +375,7 @@ record_getstring(msiobj* record, PyObject* args)
     }
     if (status != ERROR_SUCCESS)
         return msierror((int) status);
-    string = PyString_FromString(res);
+    string = PyUnicode_FromString(res);
     if (buf != res)
         free(res);
     return string;