summaryrefslogtreecommitdiffstats
path: root/ipaserver/rpcserver.py
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-01-08 16:11:05 +0100
committerRob Crittenden <rcritten@redhat.com>2013-02-01 09:16:06 -0500
commitc1735e1c80c9ec515f4a30cd212b7e331d7e2a83 (patch)
tree3dd57215bd8639c9802031f55fe56243e4b89e28 /ipaserver/rpcserver.py
parent893064f6132a9cbcfa35f6eca8964c69caad533e (diff)
downloadfreeipa-c1735e1c80c9ec515f4a30cd212b7e331d7e2a83.tar.gz
freeipa-c1735e1c80c9ec515f4a30cd212b7e331d7e2a83.tar.xz
freeipa-c1735e1c80c9ec515f4a30cd212b7e331d7e2a83.zip
Drop ipapython.compat.
Diffstat (limited to 'ipaserver/rpcserver.py')
-rw-r--r--ipaserver/rpcserver.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index 8bce48be..581c30b4 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -23,7 +23,6 @@ RPC server.
Also see the `ipalib.rpc` module.
"""
-from cgi import parse_qs
from xml.sax.saxutils import escape
from xmlrpclib import Fault
from wsgiref.util import shift_path_info
@@ -34,6 +33,7 @@ import datetime
from decimal import Decimal
import urlparse
import time
+import json
from ipalib import plugable
from ipalib.backend import Executioner
@@ -43,7 +43,6 @@ from ipalib.rpc import xml_dumps, xml_loads
from ipalib.util import parse_time_duration, normalize_name
from ipapython.dn import DN
from ipaserver.plugins.ldap2 import ldap2
-from ipapython.compat import json
from ipalib.session import session_mgr, AuthManager, get_ipa_ccache_name, load_ccache_data, bind_ipa_ccache, release_ipa_ccache, fmt_time, default_max_session_duration
from ipalib.backend import Backend
from ipalib.krb_utils import krb5_parse_ccache, KRB5_CCache, krb_ticket_expiration_threshold, krb5_format_principal_name
@@ -211,7 +210,7 @@ def extract_query(environ):
qstr = environ['QUERY_STRING']
if qstr:
query = dict(nicify_query(
- parse_qs(qstr)#, keep_blank_values=True)
+ urlparse.parse_qs(qstr)#, keep_blank_values=True)
))
else:
query = {}