summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2009-01-15 23:52:50 -0700
committerJason Gerard DeRose <jderose@redhat.com>2009-01-15 23:52:50 -0700
commit6be5e4a0a55c1ba048444430afc0e01b3048d8b9 (patch)
treeae29906fd66d290a92f15eccbe2cd3771da30739 /ipaserver
parent2f829d015b5f7b967623f03ebee5770af2bbc541 (diff)
downloadfreeipa-6be5e4a0a55c1ba048444430afc0e01b3048d8b9.tar.gz
freeipa-6be5e4a0a55c1ba048444430afc0e01b3048d8b9.tar.xz
freeipa-6be5e4a0a55c1ba048444430afc0e01b3048d8b9.zip
ipalib.rpc: now using allow_none=True after conversation with Rob; added xml_dumps() and xml_loads() functions; some name cleanup
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/rpc.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipaserver/rpc.py b/ipaserver/rpc.py
index 34de915cb..c2cb0bd59 100644
--- a/ipaserver/rpc.py
+++ b/ipaserver/rpc.py
@@ -24,7 +24,7 @@ Execute an RPC request.
from xmlrpclib import dumps, loads, Fault
from ipalib import Backend
from ipalib.errors import HandledError, CommandError
-from ipalib.rpc import xmlrpc_wrap, xmlrpc_unwrap
+from ipalib.rpc import xml_wrap, xml_unwrap
def params_2_args_options(params):
@@ -44,9 +44,9 @@ class xmlrpc(Backend):
self.info('Received RPC call to %r', method)
if method not in self.Command:
raise CommandError(name=method)
- (args, options) = params_2_args_options(xmlrpc_unwrap(params))
+ (args, options) = params_2_args_options(xml_unwrap(params))
result = self.Command[method](*args, **options)
- return (xmlrpc_wrap(result),)
+ return (xml_wrap(result),)
def execute(self, data, ccache=None, client_ip=None, locale=None):
try: