Port GetInteger and GetString to 3k.

loewis · loewis · commit 704d8b154b23 · 2008-06-02T11:32:23.000Z
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ record_getinteger(msiobj* record, PyObject* args)`
`351`	`351`	`PyErr_SetString(MSIError, "could not convert record field to integer");`
`352`	`352`	`return NULL;`
`353`	`353`	`}`
`354`		`- return PyInt_FromLong((long) status);`
	`354`	`+ return PyLong_FromLong((long) status);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`static PyObject*`
`@@ -375,7 +375,7 @@ record_getstring(msiobj* record, PyObject* args)`
`375`	`375`	`}`
`376`	`376`	`if (status != ERROR_SUCCESS)`
`377`	`377`	`return msierror((int) status);`
`378`		`- string = PyString_FromString(res);`
	`378`	`+ string = PyUnicode_FromString(res);`
`379`	`379`	`if (buf != res)`
`380`	`380`	`free(res);`
`381`	`381`	`return string;`