diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2012-02-07 08:22:14 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-02-13 22:24:29 -0500 |
| commit | dc5c6b18212e35b420572184d25056415ffeedc5 (patch) | |
| tree | 231f343dce89a8ee789cda6883b4d1b30fd10368 | |
| parent | f2d3f916808fbfcf2ea35c6aa7a9eeca1ed5f492 (diff) | |
| download | freeipa.git-dc5c6b18212e35b420572184d25056415ffeedc5.tar.gz freeipa.git-dc5c6b18212e35b420572184d25056415ffeedc5.tar.xz freeipa.git-dc5c6b18212e35b420572184d25056415ffeedc5.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
| -rw-r--r-- | ipapython/certdb.py | 2 | ||||
| -rw-r--r-- | ipapython/compat.py (renamed from ipalib/compat.py) | 0 | ||||
| -rw-r--r-- | ipaserver/install/certs.py | 2 | ||||
| -rw-r--r-- | ipaserver/rpcserver.py | 2 | ||||
| -rw-r--r-- | tests/test_ipaserver/test_rpcserver.py | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/ipapython/certdb.py b/ipapython/certdb.py index c501b61a..2c0529b9 100644 --- a/ipapython/certdb.py +++ b/ipapython/certdb.py @@ -21,7 +21,7 @@ from ipapython import ipautil from ipapython import nsslib from ipalib import pkcs10 import tempfile -from ipalib.compat import sha1 +from ipapython.compat import sha1 import shutil import os diff --git a/ipalib/compat.py b/ipapython/compat.py index 36d03844..36d03844 100644 --- a/ipalib/compat.py +++ b/ipapython/compat.py diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py index 3cbcec5c..13770811 100644 --- a/ipaserver/install/certs.py +++ b/ipaserver/install/certs.py @@ -46,7 +46,7 @@ import nss.nss as nss from ipalib import api -from ipalib.compat import sha1 +from ipapython.compat import sha1 # Apache needs access to this database so we need to create it # where apache can reach diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index a2fd6414..91e525a3 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 diff --git a/tests/test_ipaserver/test_rpcserver.py b/tests/test_ipaserver/test_rpcserver.py index 339275d8..9aa16d0c 100644 --- a/tests/test_ipaserver/test_rpcserver.py +++ b/tests/test_ipaserver/test_rpcserver.py @@ -25,7 +25,7 @@ from tests.util import create_test_api, assert_equal, raises, PluginTester from tests.data import unicode_str from ipalib import errors, Command from ipaserver import rpcserver -from ipalib.compat import json +from ipapython.compat import json class StartResponse(object): |