diff --git a/ChangeLog b/ChangeLog
index f131950e..bf29da8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 11 09:06:53 CEST 2004 Daniel Veillard <daniel@veillard.com>
+
+	* python/tests/tstLastError.py: better portability fix for f(*args),
+	  use apply(f, args) as Stephane Bidoul suggested
+
 Mon May 10 15:49:22 HKT 2004 William Brack <wbrack@mmm.com.hk>
 
 	* xmlregexp.c: enhanced xmlRegStateAddTrans to check if transition
diff --git a/python/tests/tstLastError.py b/python/tests/tstLastError.py
index 65addea7..442609ca 100755
--- a/python/tests/tstLastError.py
+++ b/python/tests/tstLastError.py
@@ -21,16 +21,7 @@ class TestCase(unittest.TestCase):
         # disable the default error handler
         libxml2.registerErrorHandler(None,None)
         try:
-            # Emulate f(*args) for older Pythons.
-            l = len(args)
-            if l == 0: f
-            elif l == 1: f(args[0])
-            elif l == 2: f(args[0], args[1])
-            elif l == 3: f(args[0], args[1], args[2])
-            elif l == 4: f(args[0], args[1], args[2], args[3])
-            elif l == 5: f(args[0], args[1], args[2], args[3], args[4])
-            else:
-                self.fail("Too many arguments for function")
+	    apply(f,args)
         except exc:
             e = libxml2.lastError()
             if e is None: