Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h
diff --git a/PC/_msi.c b/PC/_msi.c
index 70e0cc4..8dc7734 100644
--- a/PC/_msi.c
+++ b/PC/_msi.c
@@ -335,7 +335,7 @@
static PyObject*
record_getfieldcount(msiobj* record, PyObject* args)
{
- return PyInt_FromLong(MsiRecordGetFieldCount(record->h));
+ return PyLong_FromLong(MsiRecordGetFieldCount(record->h));
}
static PyObject*
@@ -502,7 +502,7 @@
switch(type) {
case VT_I2: case VT_I4:
- return PyInt_FromLong(ival);
+ return PyLong_FromLong(ival);
case VT_FILETIME:
PyErr_SetString(PyExc_NotImplementedError, "FILETIME result");
return NULL;
@@ -526,7 +526,7 @@
if (status != ERROR_SUCCESS)
return msierror(status);
- return PyInt_FromLong(result);
+ return PyLong_FromLong(result);
}
static PyObject*
@@ -544,7 +544,7 @@
0, NULL, PyString_AsString(data));
} else if (PyInt_CheckExact(data)) {
status = MsiSummaryInfoSetProperty(si->h, field, VT_I4,
- PyInt_AsLong(data), NULL, NULL);
+ PyLong_AsLong(data), NULL, NULL);
} else {
PyErr_SetString(PyExc_TypeError, "unsupported type");
return NULL;
diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index e711e13..fec7b22 100644
--- a/PC/_subprocess.c
+++ b/PC/_subprocess.c
@@ -79,7 +79,7 @@
self->handle = NULL;
/* note: return the current handle, as an integer */
- return PyInt_FromLong((long) handle);
+ return PyLong_FromLong((long) handle);
}
static PyObject*
@@ -119,7 +119,7 @@
static PyObject*
sp_handle_as_int(sp_handle_object* self)
{
- return PyInt_FromLong((long) self->handle);
+ return PyLong_FromLong((long) self->handle);
}
static PyNumberMethods sp_handle_as_number;
@@ -164,7 +164,7 @@
}
/* note: returns integer, not handle object */
- return PyInt_FromLong((long) handle);
+ return PyLong_FromLong((long) handle);
}
static PyObject *
@@ -253,7 +253,7 @@
PyErr_Clear(); /* FIXME: propagate error? */
return 0;
}
- ret = (int) PyInt_AsLong(value);
+ ret = (int) PyLong_AsLong(value);
Py_DECREF(value);
return ret;
}
@@ -462,7 +462,7 @@
if (! result)
return PyErr_SetFromWindowsErr(GetLastError());
- return PyInt_FromLong(exit_code);
+ return PyLong_FromLong(exit_code);
}
static PyObject *
@@ -484,7 +484,7 @@
if (result == WAIT_FAILED)
return PyErr_SetFromWindowsErr(GetLastError());
- return PyInt_FromLong((int) result);
+ return PyLong_FromLong((int) result);
}
static PyObject *
@@ -493,7 +493,7 @@
if (! PyArg_ParseTuple(args, ":GetVersion"))
return NULL;
- return PyInt_FromLong((int) GetVersion());
+ return PyLong_FromLong((int) GetVersion());
}
static PyObject *
@@ -534,7 +534,7 @@
static void
defint(PyObject* d, const char* name, int value)
{
- PyObject* v = PyInt_FromLong((long) value);
+ PyObject* v = PyLong_FromLong((long) value);
if (v) {
PyDict_SetItemString(d, (char*) name, v);
Py_DECREF(v);
diff --git a/PC/_winreg.c b/PC/_winreg.c
index 4deb5a9..e1145b1 100644
--- a/PC/_winreg.c
+++ b/PC/_winreg.c
@@ -614,8 +614,8 @@
ok = PyHKEY_Close(obHandle);
}
#if SIZEOF_LONG >= SIZEOF_HKEY
- else if (PyInt_Check(obHandle)) {
- long rc = RegCloseKey((HKEY)PyInt_AsLong(obHandle));
+ else if (PyLong_Check(obHandle)) {
+ long rc = RegCloseKey((HKEY)PyLong_AsLong(obHandle));
ok = (rc == ERROR_SUCCESS);
if (!ok)
PyErr_SetFromWindowsErrWithFunction(rc, "RegCloseKey");
@@ -810,9 +810,9 @@
switch (typ) {
case REG_DWORD:
if (retDataSize == 0)
- obData = PyInt_FromLong(0);
+ obData = PyLong_FromLong(0);
else
- obData = PyInt_FromLong(*(int *)retDataBuf);
+ obData = PyLong_FromLong(*(int *)retDataBuf);
break;
case REG_SZ:
case REG_EXPAND_SZ:
@@ -1362,7 +1362,7 @@
static void
insint(PyObject * d, char * name, long value)
{
- PyObject *v = PyInt_FromLong(value);
+ PyObject *v = PyLong_FromLong(value);
if (!v || PyDict_SetItemString(d, name, v))
PyErr_Clear();
Py_XDECREF(v);
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
index ef73c6f..ae6b911 100755
--- a/PC/msvcrtmodule.c
+++ b/PC/msvcrtmodule.c
@@ -74,7 +74,7 @@
if (flags == -1)
return PyErr_SetFromErrno(PyExc_IOError);
- return PyInt_FromLong(flags);
+ return PyLong_FromLong(flags);
}
// Convert an OS file handle to a C runtime file descriptor.
@@ -92,7 +92,7 @@
if (fd == -1)
return PyErr_SetFromErrno(PyExc_IOError);
- return PyInt_FromLong(fd);
+ return PyLong_FromLong(fd);
}
// Convert a C runtime file descriptor to an OS file handle.
@@ -126,7 +126,7 @@
return NULL;
ok = _kbhit();
- return PyInt_FromLong(ok);
+ return PyLong_FromLong(ok);
}
static PyObject *
@@ -192,7 +192,7 @@
static void
insertint(PyObject *d, char *name, int value)
{
- PyObject *v = PyInt_FromLong((long) value);
+ PyObject *v = PyLong_FromLong((long) value);
if (v == NULL) {
/* Don't bother reporting this error */
PyErr_Clear();
@@ -214,7 +214,7 @@
if (!PyArg_ParseTuple(args, "ii", &type, &file))
return NULL;
res = _CrtSetReportFile(type, (_HFILE)file);
- return PyInt_FromLong((long)res);
+ return PyLong_FromLong((long)res);
Py_INCREF(Py_None);
return Py_None;
}