summaryrefslogtreecommitdiffstats
path: root/ipaserver/rpcserver.py
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2012-02-07 08:22:14 -0500
committerRob Crittenden <rcritten@redhat.com>2012-02-13 22:22:49 -0500
commit64883787645cc972e1b6f905a235e0f4df8fcf2a (patch)
tree6b196d45983a54e9eb8fab8bc6c20a36acd0a628 /ipaserver/rpcserver.py
parente5c07508060bdafb315c25cd712ceb23508ab20a (diff)
downloadfreeipa-64883787645cc972e1b6f905a235e0f4df8fcf2a.tar.gz
freeipa-64883787645cc972e1b6f905a235e0f4df8fcf2a.tar.xz
freeipa-64883787645cc972e1b6f905a235e0f4df8fcf2a.zip
Move the compat module from ipalib to ipapython.
Fixes import problems trying to import just ipalib/compat.py. https://fedorahosted.org/freeipa/ticket/754
Diffstat (limited to 'ipaserver/rpcserver.py')
-rw-r--r--ipaserver/rpcserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index a2fd64149..91e525a31 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -31,7 +31,7 @@ from ipalib.errors import PublicError, InternalError, CommandError, JSONError, C
from ipalib.request import context, Connection, destroy_context
from ipalib.rpc import xml_dumps, xml_loads
from ipalib.util import make_repr, parse_time_duration
-from ipalib.compat import json
+from ipapython.compat import json
from ipalib.session import session_mgr, read_krbccache_file, store_krbccache_file, delete_krbccache_file, fmt_time, default_max_session_lifetime
from ipalib.backend import Backend
from ipalib.krb_utils import krb5_parse_ccache, KRB5_CCache, krb5_format_tgt_principal_name, krb5_format_service_principal_name, krb_ticket_expiration_threshold