From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 2 Jun 2008 11:32:23 +0000 (+0000)
Subject: Port GetInteger and GetString to 3k.
X-Git-Tag: v3.0b1~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=704d8b154b23dfc2fdf5a378e31636ba1a6e2d22;p=thirdparty%2FPython%2Fcpython.git

Port GetInteger and GetString to 3k.
---

diff --git a/PC/_msi.c b/PC/_msi.c
index d3727760a561..6c6f2f82ff31 100644
--- 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;