mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Move the compat module from ipalib to ipapython.
Fixes import problems trying to import just ipalib/compat.py. https://fedorahosted.org/freeipa/ticket/754
This commit is contained in:
parent
e5c0750806
commit
6488378764
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user