Binding python: for empty GList return empty tuples, not None

2 files changed, 18 insertions, 18 deletions

diff --git a/bindings/python/tests/binding_tests.py b/bindings/python/tests/binding_tests.py
index 389b474a..8609a1ae 100755
--- a/bindings/python/tests/binding_tests.py
+++ b/bindings/python/tests/binding_tests.py
@@ -81,7 +81,7 @@ class BindingTestCase(unittest.TestCase):
 
         authnRequest = lasso.LibAuthnRequest()
 
-        self.failUnlessEqual(authnRequest.respondWith, None)
+        self.failUnlessEqual(authnRequest.respondWith, ())
 
         respondWith = []
         self.failUnlessEqual(len(respondWith), 0)
@@ -117,7 +117,7 @@ class BindingTestCase(unittest.TestCase):
         self.failUnlessEqual(authnRequest.respondWith[1], 'second string')
         self.failUnlessEqual(authnRequest.respondWith[2], 'third string')
         authnRequest.respondWith = None
-        self.failUnlessEqual(authnRequest.respondWith, None)
+        self.failUnlessEqual(authnRequest.respondWith, ())
 
         del authnRequest
 
@@ -126,7 +126,7 @@ class BindingTestCase(unittest.TestCase):
 
         response = lasso.SamlpResponse()
 
-        self.failUnlessEqual(response.assertion, None)
+        self.failUnlessEqual(response.assertion, ())
 
         assertions = []
         self.failUnlessEqual(len(assertions), 0)
@@ -169,7 +169,7 @@ class BindingTestCase(unittest.TestCase):
         self.failUnlessEqual(response.assertion[1].assertionId, 'assertion 2')
         self.failUnlessEqual(response.assertion[2].assertionId, 'assertion 3')
         response.assertion = None
-        self.failUnlessEqual(response.assertion, None)
+        self.failUnlessEqual(response.assertion, ())
 
         del response
 
@@ -178,7 +178,7 @@ class BindingTestCase(unittest.TestCase):
 
         authnRequest = lasso.LibAuthnRequest()
 
-        self.failUnlessEqual(authnRequest.extension, None)
+        self.failUnlessEqual(authnRequest.extension, ())
 
         actionString1 = """\
 <lib:Extension xmlns:lib="urn:liberty:iff:2003-08">
@@ -227,7 +227,7 @@ class BindingTestCase(unittest.TestCase):
         self.failUnlessEqual(authnRequest.extension[1], actionString2)
         self.failUnlessEqual(authnRequest.extension[2], actionString3)
         authnRequest.extension = None
-        self.failUnlessEqual(authnRequest.extension, None)
+        self.failUnlessEqual(authnRequest.extension, ())
 
         del authnRequest
 
diff --git a/bindings/python/wrapper_top.c b/bindings/python/wrapper_top.c
index d6b5ba20..1934eaec 100644
--- a/bindings/python/wrapper_top.c
+++ b/bindings/python/wrapper_top.c
@@ -341,13 +341,13 @@ get_list_of_strings(const GList *a_list) {
 	PyObject *a_tuple = NULL;
 	int i = 0;
 
-	if (! a_list) {
-		return noneRef();
-	}
-    /* Cast because g_list_length does not take const but is a const function */
+	/* Cast because g_list_length does not take const but is a const function */
 	a_tuple = PyTuple_New(g_list_length((GList*)a_list));
 	if (! a_tuple)
 		goto failure;
+	if (! a_list) {
+		return a_tuple;
+	}
 	while (a_list) {
 		if (a_list->data) {
 			PyObject *str = PyString_FromString((const char*)a_list->data);
@@ -376,13 +376,13 @@ get_list_of_xml_nodes(const GList *a_list) {
 	PyObject *a_tuple = NULL;
 	int i = 0;
 
-	if (! a_list) {
-		return noneRef();
-	}
-    /* Cast because g_list_length does not take const but is a const function */
+	/* Cast because g_list_length does not take const but is a const function */
 	a_tuple = PyTuple_New(g_list_length((GList*)a_list));
 	if (! a_tuple)
 		goto failure;
+	if (! a_list) {
+		return a_tuple;
+	}
 	while (a_list) {
 		if (a_list->data) {
 			PyObject *str = get_pystring_from_xml_node((xmlNode*)a_list->data);
@@ -413,13 +413,13 @@ get_list_of_pygobject(const GList *a_list) {
 	PyObject *a_tuple = NULL;
 	int i = 0;
 
-	if (! a_list) {
-		return noneRef();
-	}
-    /* Cast because g_list_length does not take const but is a const function */
+	/* Cast because g_list_length does not take const but is a const function */
 	a_tuple = PyTuple_New(g_list_length((GList*)a_list));
 	if (! a_tuple)
 		goto failure;
+	if (! a_list) {
+		return a_tuple;
+	}
 	while (a_list) {
 		if (a_list->data) {
 			PyObject *pygobject;