From 918721c1d0ad0b330825aa9e3f464f36e31ad0c1 Mon Sep 17 00:00:00 2001
From: Jason Gerard DeRose <jderose@redhat.com>
Date: Fri, 26 Mar 2010 03:56:53 -0600
Subject: XML-RPC signature change

---
 ipaserver/rpcserver.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'ipaserver/rpcserver.py')

diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index 667a7c4c..795a240d 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -72,12 +72,11 @@ def read_input(environ):
 
 
 def params_2_args_options(params):
-    assert type(params) is tuple
     if len(params) == 0:
         return (tuple(), dict())
-    if type(params[-1]) is dict:
-        return (params[:-1], params[-1])
-    return (params, dict())
+    if len(params) == 1:
+        return (params[0], dict())
+    return (params[0], params[1])
 
 
 def nicify_query(query, encoding='utf-8'):
-- 
cgit