py3: Remove #define PyInt_FromLong PyLong_FromLong

This allows us to end the use of Python 2/3 compatability macros.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power

9 files changed, 36 insertions, 36 deletions

diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index 986f32904e7..a73ca9302dd 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -450,7 +450,7 @@ static PyObject *py_gensec_max_update_size(PyObject *self,
 	struct gensec_security *security = pytalloc_get_type(self, struct gensec_security);
 	unsigned int max_update_size = gensec_max_update_size(security);
 
-	return PyInt_FromLong(max_update_size);
+	return PyLong_FromLong(max_update_size);
 }
 
 static PyObject *py_gensec_update(PyObject *self, PyObject *args)
@@ -720,14 +720,14 @@ MODULE_INIT_FUNC(gensec)
 	if (m == NULL)
 		return NULL;
 
-	PyModule_AddObject(m, "FEATURE_SESSION_KEY",     PyInt_FromLong(GENSEC_FEATURE_SESSION_KEY));
-	PyModule_AddObject(m, "FEATURE_SIGN",            PyInt_FromLong(GENSEC_FEATURE_SIGN));
-	PyModule_AddObject(m, "FEATURE_SEAL",            PyInt_FromLong(GENSEC_FEATURE_SEAL));
-	PyModule_AddObject(m, "FEATURE_DCE_STYLE",       PyInt_FromLong(GENSEC_FEATURE_DCE_STYLE));
-	PyModule_AddObject(m, "FEATURE_ASYNC_REPLIES",   PyInt_FromLong(GENSEC_FEATURE_ASYNC_REPLIES));
-	PyModule_AddObject(m, "FEATURE_DATAGRAM_MODE",   PyInt_FromLong(GENSEC_FEATURE_DATAGRAM_MODE));
-	PyModule_AddObject(m, "FEATURE_SIGN_PKT_HEADER", PyInt_FromLong(GENSEC_FEATURE_SIGN_PKT_HEADER));
-	PyModule_AddObject(m, "FEATURE_NEW_SPNEGO",      PyInt_FromLong(GENSEC_FEATURE_NEW_SPNEGO));
+	PyModule_AddObject(m, "FEATURE_SESSION_KEY",     PyLong_FromLong(GENSEC_FEATURE_SESSION_KEY));
+	PyModule_AddObject(m, "FEATURE_SIGN",            PyLong_FromLong(GENSEC_FEATURE_SIGN));
+	PyModule_AddObject(m, "FEATURE_SEAL",            PyLong_FromLong(GENSEC_FEATURE_SEAL));
+	PyModule_AddObject(m, "FEATURE_DCE_STYLE",       PyLong_FromLong(GENSEC_FEATURE_DCE_STYLE));
+	PyModule_AddObject(m, "FEATURE_ASYNC_REPLIES",   PyLong_FromLong(GENSEC_FEATURE_ASYNC_REPLIES));
+	PyModule_AddObject(m, "FEATURE_DATAGRAM_MODE",   PyLong_FromLong(GENSEC_FEATURE_DATAGRAM_MODE));
+	PyModule_AddObject(m, "FEATURE_SIGN_PKT_HEADER", PyLong_FromLong(GENSEC_FEATURE_SIGN_PKT_HEADER));
+	PyModule_AddObject(m, "FEATURE_NEW_SPNEGO",      PyLong_FromLong(GENSEC_FEATURE_NEW_SPNEGO));
 
 	Py_INCREF(&Py_Security);
 	PyModule_AddObject(m, "Security", (PyObject *)&Py_Security);
diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c
index f173a355997..fd25347c229 100644
--- a/source4/dsdb/pydsdb.c
+++ b/source4/dsdb/pydsdb.c
@@ -366,7 +366,7 @@ static PyObject *py_dsdb_get_systemFlags_from_lDAPDisplayName(PyObject *self, Py
 		return NULL;
 	}
 
-	return PyInt_FromLong(attribute->systemFlags);
+	return PyLong_FromLong(attribute->systemFlags);
 }
 
 /*
@@ -398,7 +398,7 @@ static PyObject *py_dsdb_get_linkId_from_lDAPDisplayName(PyObject *self, PyObjec
 		return NULL;
 	}
 
-	return PyInt_FromLong(attribute->linkID);
+	return PyLong_FromLong(attribute->linkID);
 }
 
 /*
@@ -1164,7 +1164,7 @@ static PyObject *py_dsdb_allocate_rid(PyObject *self, PyObject *args)
 	TALLOC_FREE(rid_return);
 	TALLOC_FREE(ext_res);
 
-	return PyInt_FromLong(rid);
+	return PyLong_FromLong(rid);
 }
 
 static PyObject *py_dns_delete_tombstones(PyObject *self, PyObject *args)
@@ -1499,7 +1499,7 @@ MODULE_INIT_FUNC(dsdb)
 	if (m == NULL)
 		return NULL;
 
-#define ADD_DSDB_FLAG(val)  PyModule_AddObject(m, #val, PyInt_FromLong(val))
+#define ADD_DSDB_FLAG(val)  PyModule_AddObject(m, #val, PyLong_FromLong(val))
 
 	/* "userAccountControl" flags */
 	ADD_DSDB_FLAG(UF_NORMAL_ACCOUNT);
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index e6b9c770dfd..148c941a3a2 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -544,8 +544,8 @@ MODULE_INIT_FUNC(messaging)
 
 	Py_INCREF((PyObject *)&imessaging_Type);
 	PyModule_AddObject(mod, "Messaging", (PyObject *)&imessaging_Type);
-	PyModule_AddObject(mod, "IRPC_CALL_TIMEOUT", PyInt_FromLong(IRPC_CALL_TIMEOUT));
-	PyModule_AddObject(mod, "IRPC_CALL_TIMEOUT_INF", PyInt_FromLong(IRPC_CALL_TIMEOUT_INF));
+	PyModule_AddObject(mod, "IRPC_CALL_TIMEOUT", PyLong_FromLong(IRPC_CALL_TIMEOUT));
+	PyModule_AddObject(mod, "IRPC_CALL_TIMEOUT_INF", PyLong_FromLong(IRPC_CALL_TIMEOUT_INF));
 
 	return mod;
 }
diff --git a/source4/lib/policy/pypolicy.c b/source4/lib/policy/pypolicy.c
index 038fa0428c3..ca25d190134 100644
--- a/source4/lib/policy/pypolicy.c
+++ b/source4/lib/policy/pypolicy.c
@@ -163,12 +163,12 @@ MODULE_INIT_FUNC(policy)
 		return m;
 
 	PyModule_AddObject(m, "GPO_FLAG_USER_DISABLE",
-					   PyInt_FromLong(GPO_FLAG_USER_DISABLE));
+					   PyLong_FromLong(GPO_FLAG_USER_DISABLE));
 	PyModule_AddObject(m, "GPO_MACHINE_USER_DISABLE",
-					   PyInt_FromLong(GPO_FLAG_MACHINE_DISABLE));
+					   PyLong_FromLong(GPO_FLAG_MACHINE_DISABLE));
 	PyModule_AddObject(m, "GPLINK_OPT_DISABLE",
-					   PyInt_FromLong(GPLINK_OPT_DISABLE ));
+					   PyLong_FromLong(GPLINK_OPT_DISABLE ));
 	PyModule_AddObject(m, "GPLINK_OPT_ENFORCE ",
-					   PyInt_FromLong(GPLINK_OPT_ENFORCE ));
+					   PyLong_FromLong(GPLINK_OPT_ENFORCE ));
 	return m;
 }
diff --git a/source4/lib/registry/pyregistry.c b/source4/lib/registry/pyregistry.c
index 5b02a79787d..b08cf4f09e7 100644
--- a/source4/lib/registry/pyregistry.c
+++ b/source4/lib/registry/pyregistry.c
@@ -471,15 +471,15 @@ MODULE_INIT_FUNC(registry)
 	if (m == NULL)
 		return NULL;
 
-	PyModule_AddObject(m, "HKEY_CLASSES_ROOT", PyInt_FromLong(HKEY_CLASSES_ROOT));
-	PyModule_AddObject(m, "HKEY_CURRENT_USER", PyInt_FromLong(HKEY_CURRENT_USER));
-	PyModule_AddObject(m, "HKEY_LOCAL_MACHINE", PyInt_FromLong(HKEY_LOCAL_MACHINE));
-	PyModule_AddObject(m, "HKEY_USERS", PyInt_FromLong(HKEY_USERS));
-	PyModule_AddObject(m, "HKEY_PERFORMANCE_DATA", PyInt_FromLong(HKEY_PERFORMANCE_DATA));
-	PyModule_AddObject(m, "HKEY_CURRENT_CONFIG", PyInt_FromLong(HKEY_CURRENT_CONFIG));
-	PyModule_AddObject(m, "HKEY_DYN_DATA", PyInt_FromLong(HKEY_DYN_DATA));
-	PyModule_AddObject(m, "HKEY_PERFORMANCE_TEXT", PyInt_FromLong(HKEY_PERFORMANCE_TEXT));
-	PyModule_AddObject(m, "HKEY_PERFORMANCE_NLSTEXT", PyInt_FromLong(HKEY_PERFORMANCE_NLSTEXT));
+	PyModule_AddObject(m, "HKEY_CLASSES_ROOT", PyLong_FromLong(HKEY_CLASSES_ROOT));
+	PyModule_AddObject(m, "HKEY_CURRENT_USER", PyLong_FromLong(HKEY_CURRENT_USER));
+	PyModule_AddObject(m, "HKEY_LOCAL_MACHINE", PyLong_FromLong(HKEY_LOCAL_MACHINE));
+	PyModule_AddObject(m, "HKEY_USERS", PyLong_FromLong(HKEY_USERS));
+	PyModule_AddObject(m, "HKEY_PERFORMANCE_DATA", PyLong_FromLong(HKEY_PERFORMANCE_DATA));
+	PyModule_AddObject(m, "HKEY_CURRENT_CONFIG", PyLong_FromLong(HKEY_CURRENT_CONFIG));
+	PyModule_AddObject(m, "HKEY_DYN_DATA", PyLong_FromLong(HKEY_DYN_DATA));
+	PyModule_AddObject(m, "HKEY_PERFORMANCE_TEXT", PyLong_FromLong(HKEY_PERFORMANCE_TEXT));
+	PyModule_AddObject(m, "HKEY_PERFORMANCE_NLSTEXT", PyLong_FromLong(HKEY_PERFORMANCE_NLSTEXT));
 
 	Py_INCREF(&PyRegistry);
 	PyModule_AddObject(m, "Registry", (PyObject *)&PyRegistry);
diff --git a/source4/lib/wmi/wmi_wrap.c b/source4/lib/wmi/wmi_wrap.c
index 6732f4ed5cb..f8200bac92a 100644
--- a/source4/lib/wmi/wmi_wrap.c
+++ b/source4/lib/wmi/wmi_wrap.c
@@ -2803,14 +2803,14 @@ SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val)
 }
 
 
-  #define SWIG_From_long   PyInt_FromLong 
+  #define SWIG_From_long   PyLong_FromLong 
 
 
 SWIGINTERNINLINE PyObject* 
 SWIG_From_unsigned_SS_long  (unsigned long value)
 {
   return (value > LONG_MAX) ?
-    PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)(value)); 
+    PyLong_FromUnsignedLong(value) : PyLong_FromLong((long)(value)); 
 }
 
 
diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
index 26989c1a433..19bfdd56559 100644
--- a/source4/librpc/ndr/py_security.c
+++ b/source4/librpc/ndr/py_security.c
@@ -456,7 +456,7 @@ static PyObject *py_privilege_id(PyObject *self, PyObject *args)
 	if (!PyArg_ParseTuple(args, "s", &name))
 		return NULL;
 
-	return PyInt_FromLong(sec_privilege_id(name));
+	return PyLong_FromLong(sec_privilege_id(name));
 }
 
 static PyObject *py_random_sid(PyObject *self,
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 93d00d84495..e0b7c690e07 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -253,14 +253,14 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
 
 	if (!dict_insert(parameters,
 			 "debuglevel",
-			 PyInt_FromLong(DEBUGLEVEL))) {
+			 PyLong_FromLong(DEBUGLEVEL))) {
 		status = NT_STATUS_UNSUCCESSFUL;
 		goto out;
 	}
 
 	if (!dict_insert(parameters,
 			 "use_ntvfs",
-			 PyInt_FromLong(settings->use_ntvfs))) {
+			 PyLong_FromLong(settings->use_ntvfs))) {
 		status = NT_STATUS_UNSUCCESSFUL;
 		goto out;
 	}
@@ -441,14 +441,14 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context
 
 	if (!dict_insert(parameters,
 			 "secure_channel_type",
-			 PyInt_FromLong(settings->secure_channel_type))) {
+			 PyLong_FromLong(settings->secure_channel_type))) {
 		status = NT_STATUS_UNSUCCESSFUL;
 		goto out;
 	}
 
 	if (!dict_insert(parameters,
 			 "key_version_number",
-			 PyInt_FromLong(settings->key_version_number))) {
+			 PyLong_FromLong(settings->key_version_number))) {
 		status = NT_STATUS_UNSUCCESSFUL;
 		goto out;
 	}
diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index a251b024ebb..63da7d64242 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -348,7 +348,7 @@ static PyObject *py_lp_dump_a_parameter(PyObject *self, PyObject *args)
 static PyObject *py_lp_log_level(PyObject *self, PyObject *unused)
 {
 	int ret = debuglevel_get();
-	return PyInt_FromLong(ret);
+	return PyLong_FromLong(ret);
 }