IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use absolute imports

Browse Source 
In Python 3, implicit relative imports will not be supported.
Use fully-qualified imports everywhere.

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Petr Viktorin
2015-07-31 10:15:01 +02:00
committed by Tomas Babej
parent 262faec70a
commit 5435a8a32a
63 changed files with 159 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ipalib/__init__.py
View File

@@ -880,16 +880,16 @@ freeIPA.org:
'''
import os
import plugable
from backend import Backend
from frontend import Command, LocalOrRemote, Updater
from frontend import Object, Method
from crud import Create, Retrieve, Update, Delete, Search
from parameters import DefaultFrom, Bool, Flag, Int, Decimal, Bytes, Str, IA5Str, Password, DNParam, DeprecatedParam
from parameters import (BytesEnum, StrEnum, IntEnum, AccessTime, File,
from ipalib import plugable
from ipalib.backend import Backend
from ipalib.frontend import Command, LocalOrRemote, Updater
from ipalib.frontend import Object, Method
from ipalib.crud import Create, Retrieve, Update, Delete, Search
from ipalib.parameters import DefaultFrom, Bool, Flag, Int, Decimal, Bytes, Str, IA5Str, Password, DNParam, DeprecatedParam
from ipalib.parameters import (BytesEnum, StrEnum, IntEnum, AccessTime, File,
DateTime, DNSNameParam)
from errors import SkipPluginModule
from text import _, ngettext, GettextFactory, NGettextFactory
from ipalib.errors import SkipPluginModule
from ipalib.text import _, ngettext, GettextFactory, NGettextFactory
version_info = (2, 0, 0, 'alpha', 0)
if version_info[3] == 'final':
@@ -935,7 +935,7 @@ def create_api(mode='dummy'):
api = create_api(mode=None)
if os.environ.get('IPA_UNIT_TEST_MODE', None) == 'cli_test':
from cli import cli_plugins
from ipalib.cli import cli_plugins
api.bootstrap(context='cli', in_server=False, in_tree=True)
for klass in cli_plugins:
api.add_plugin(klass)

7
ipalib/backend.py
View File

@@ -22,10 +22,11 @@ Base classes for all backed-end plugins.
"""
import threading
import plugable
import os
from errors import PublicError, InternalError, CommandError
from request import context, Connection, destroy_context
from ipalib import plugable
from ipalib.errors import PublicError, InternalError, CommandError
from ipalib.request import context, Connection, destroy_context
class Backend(plugable.Plugin):

5
ipalib/base.py
View File

@@ -22,8 +22,9 @@ Foundational classes and functions.
"""
import re
from constants import NAME_REGEX, NAME_ERROR
from constants import TYPE_ERROR, SET_ERROR, DEL_ERROR, OVERRIDE_ERROR
from ipalib.constants import NAME_REGEX, NAME_ERROR
from ipalib.constants import TYPE_ERROR, SET_ERROR, DEL_ERROR, OVERRIDE_ERROR
class ReadOnly(object):

18
ipalib/cli.py
View File

@@ -41,15 +41,15 @@ except ImportError:
# even in cases that IPA isn't installed on the dev machine.
pass
import frontend
import backend
import plugable
from errors import (PublicError, CommandError, HelpError, InternalError,
NoSuchNamespaceError, ValidationError, NotFound,
NotConfiguredError, PromptFailed)
from constants import CLI_TAB, LDAP_GENERALIZED_TIME_FORMAT
from parameters import File, Str, Enum, Any, Flag
from text import _
from ipalib import frontend
from ipalib import backend
from ipalib import plugable
from ipalib.errors import (PublicError, CommandError, HelpError, InternalError,
NoSuchNamespaceError, ValidationError, NotFound,
NotConfiguredError, PromptFailed)
from ipalib.constants import CLI_TAB, LDAP_GENERALIZED_TIME_FORMAT
from ipalib.parameters import File, Str, Enum, Any, Flag
from ipalib.text import _
from ipalib import api
from ipapython.version import API_VERSION
from ipapython.dnsutil import DNSName

6
ipalib/config.py
View File

@@ -37,9 +37,9 @@ from os import path
import sys
from ipapython.dn import DN
from base import check_name
from constants import CONFIG_SECTION
from constants import OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
from ipalib.base import check_name
from ipalib.constants import CONFIG_SECTION
from ipalib.constants import OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
class Env(object):

8
ipalib/crud.py
View File

@@ -119,10 +119,10 @@ For example, compare ``user.params`` with ``user_add.output_params`` and
Note that the above are all equal.
"""
from frontend import Method, Object
import backend
import parameters
import output
from ipalib.frontend import Method, Object
from ipalib import backend
from ipalib import parameters
from ipalib import output
from ipalib.text import _

3
ipalib/errors.py
View File

@@ -103,8 +103,7 @@ current block assignments:
"""
from ipalib.text import ngettext as ungettext
import messages
from ipalib import messages
from ipaplatform.paths import paths

14
ipalib/frontend.py
View File

@@ -23,21 +23,21 @@ Base classes for all front-end plugins.
import re
from distutils import version
from textwrap import wrap
from ipapython.version import API_VERSION
from ipapython.ipa_log_manager import root_logger
from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES
from base import NameSpace
from plugable import Plugin
from parameters import create_param, Param, Str, Flag, Password
from output import Output, Entry, ListOfEntries
from text import _
from errors import (ZeroArgumentError, MaxArgumentError, OverlapError,
from ipalib.base import NameSpace
from ipalib.plugable import Plugin
from ipalib.parameters import create_param, Param, Str, Flag, Password
from ipalib.output import Output, Entry, ListOfEntries
from ipalib.text import _
from ipalib.errors import (ZeroArgumentError, MaxArgumentError, OverlapError,
VersionError, OptionError, InvocationError,
ValidationError, ConversionError)
from ipalib import messages
from ipalib.util import json_serialize
from textwrap import wrap
RULE_FLAG = 'validation_rule'

7
ipalib/output.py
View File

@@ -23,9 +23,10 @@ Simple description of return values.
from inspect import getdoc
from types import NoneType
from plugable import ReadOnly, lock
from capabilities import client_has_capability
from text import _
from ipalib.plugable import ReadOnly, lock
from ipalib.capabilities import client_has_capability
from ipalib.text import _
class Output(ReadOnly):

21
ipalib/parameters.py
View File

@@ -104,19 +104,20 @@ import decimal
import base64
import datetime
from xmlrpclib import MAXINT, MININT
from types import NoneType
from text import _ as ugettext
from plugable import ReadOnly, lock, check_name
from errors import ConversionError, RequirementError, ValidationError
from errors import PasswordMismatch, Base64DecodeError
from constants import TYPE_ERROR, CALLABLE_ERROR, LDAP_GENERALIZED_TIME_FORMAT
from text import Gettext, FixMe
from util import json_serialize, validate_idna_domain
import encodings.idna
import dns.name
from ipalib.text import _ as ugettext
from ipalib.plugable import ReadOnly, lock, check_name
from ipalib.errors import ConversionError, RequirementError, ValidationError
from ipalib.errors import PasswordMismatch, Base64DecodeError
from ipalib.constants import TYPE_ERROR, CALLABLE_ERROR, LDAP_GENERALIZED_TIME_FORMAT
from ipalib.text import Gettext, FixMe
from ipalib.util import json_serialize, validate_idna_domain
from ipapython.dn import DN
from ipapython.dnsutil import DNSName
import dns.name
import encodings.idna
def _is_null(value):
return not value and value != 0 # NOTE: False == 0

12
ipalib/plugable.py
View File

@@ -32,16 +32,16 @@ import threading
import os
from os import path
import optparse
import errors
import textwrap
import collections
import importlib
from config import Env
import text
from text import _
from base import ReadOnly, NameSpace, lock, islocked, check_name
from constants import DEFAULT_CONFIG
from ipalib import errors
from ipalib.config import Env
from ipalib import text
from ipalib.text import _
from ipalib.base import ReadOnly, NameSpace, lock, islocked, check_name
from ipalib.constants import DEFAULT_CONFIG
from ipapython.ipa_log_manager import *
from ipapython.version import VERSION, API_VERSION

5
ipalib/request.py
View File

@@ -23,8 +23,9 @@ Per-request thread-local data.
"""
import threading
from base import ReadOnly, lock
from constants import OVERRIDE_ERROR, CALLABLE_ERROR
from ipalib.base import ReadOnly, lock
from ipalib.constants import OVERRIDE_ERROR, CALLABLE_ERROR
# Thread-local storage of most per-request information

5
ipalib/session.py
View File

@@ -18,12 +18,13 @@
import memcache
import random
import errors
import os
import re
import time
from urllib2 import urlparse
from text import _
from ipalib import errors
from ipalib.text import _
from ipapython.ipa_log_manager import *
from ipalib import api, errors
from ipaplatform.paths import paths

3
ipalib/text.py
View File

@@ -115,7 +115,8 @@ forms, see `NGettextFactory` and `NGettext`.
import threading
import locale
import gettext
from request import context
from ipalib.request import context
def create_translation(key):

2
ipapython/dnssec/bindmgr.py
View File

@@ -17,7 +17,7 @@ from ipapython.dn import DN
from ipapython import ipa_log_manager, ipautil
from ipaplatform.paths import paths
from temp import TemporaryDirectory
from ipapython.dnssec.temp import TemporaryDirectory
time_bindfmt = '%Y%m%d%H%M%S'

6
ipapython/dnssec/keysyncer.py
View File

@@ -9,9 +9,9 @@ import os
from ipaplatform.paths import paths
from ipapython import ipautil
from syncrepl import SyncReplConsumer
from odsmgr import ODSMgr
from bindmgr import BINDMgr
from ipapython.dnssec.syncrepl import SyncReplConsumer
from ipapython.dnssec.odsmgr import ODSMgr
from ipapython.dnssec.bindmgr import BINDMgr
SIGNING_ATTR = 'idnsSecInlineSigning'
OBJCLASS_ATTR = 'objectClass'

3
ipapython/dnssec/ldapkeydb.py
View File

@@ -13,7 +13,8 @@ from ipapython import ipaldap
from ipapython import ipautil
from ipaplatform.paths import paths
from abshsm import attrs_name2id, attrs_id2name, bool_attr_names, populate_pkcs11_metadata, AbstractHSM
from ipapython.dnssec.abshsm import (attrs_name2id, attrs_id2name, AbstractHSM,
bool_attr_names, populate_pkcs11_metadata)
import _ipap11helper
import uuid

4
ipapython/dnssec/localhsm.py
View File

@@ -14,7 +14,9 @@ import time
from ipaplatform.paths import paths
import _ipap11helper
from abshsm import attrs_name2id, attrs_id2name, AbstractHSM, keytype_id2name, keytype_name2id, ldap2p11helper_api_params
from ipapython.dnssec.abshsm import (attrs_name2id, attrs_id2name, AbstractHSM,
keytype_id2name, keytype_name2id,
ldap2p11helper_api_params)
private_key_api_params = set(["label", "id", "data", "unwrapping_key",
"wrapping_mech", "key_type", "cka_always_authenticate", "cka_copyable",

2
ipapython/ipa_log_manager.py
View File

@@ -29,7 +29,7 @@ import sys
import re
import copy
from log_manager import LogManager, parse_log_level
from ipapython.log_manager import LogManager, parse_log_level
#-------------------------------------------------------------------------------

4
ipaserver/install/bindinstance.py
View File

@@ -27,8 +27,8 @@ import time
import ldap
import installutils
import service
from ipaserver.install import installutils
from ipaserver.install import service
from ipaserver.install.cainstance import IPA_CA_RECORD
from ipapython import sysrestore, ipautil, ipaldap
from ipapython.ipa_log_manager import *

9
ipaserver/install/dnskeysyncinstance.py
View File

@@ -2,10 +2,6 @@
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
#
from ipapython.dnsutil import DNSName
import service
import installutils
import os
import pwd
import grp
@@ -14,8 +10,11 @@ import shutil
import stat
import ldap
import _ipap11helper
import _ipap11helper
from ipapython.dnsutil import DNSName
from ipaserver.install import service
from ipaserver.install import installutils
from ipapython.ipa_log_manager import *
from ipapython.dn import DN
from ipapython import ipaldap

9
ipaserver/install/dsinstance.py
View File

@@ -27,12 +27,13 @@ import time
import tempfile
import stat
import ldap
from ipapython.ipa_log_manager import *
from ipapython import ipautil, sysrestore, ipaldap
import service
import installutils
import certs
import ldap
from ipaserver.install import service
from ipaserver.install import installutils
from ipaserver.install import certs
from ipaserver.install import ldapupdate
from ipaserver.install import replication
from ipaserver.install import sysupgrade

6
ipaserver/install/httpinstance.py
View File

@@ -27,9 +27,9 @@ import dbus
import shlex
import pipes
import service
import certs
import installutils
from ipaserver.install import service
from ipaserver.install import certs
from ipaserver.install import installutils
from ipapython import sysrestore
from ipapython import ipautil
from ipapython import dogtag

2
ipaserver/install/memcacheinstance.py
View File

@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import service
from ipaserver.install import service
class MemcacheInstance(service.SimpleServiceInstance):
def __init__(self):

2
ipaserver/install/ntpinstance.py
View File

@@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import service
from ipaserver.install import service
from ipapython import sysrestore
from ipapython import ipautil
from ipaplatform.paths import paths

4
ipaserver/install/odsexporterinstance.py
View File

@@ -2,14 +2,14 @@
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
#
import service
import installutils
import os
import pwd
import grp
import ldap
from ipaserver.install import service
from ipaserver.install import installutils
from ipapython.ipa_log_manager import *
from ipapython.dn import DN
from ipapython import sysrestore, ipautil, ipaldap

7
ipaserver/install/opendnssecinstance.py
View File

@@ -3,19 +3,16 @@
#
import random
import service
import os
import pwd
import grp
import stat
import shutil
from subprocess import CalledProcessError
import _ipap11helper
import installutils
from ipaserver.install import service
from ipaserver.install import installutils
from ipapython.ipa_log_manager import *
from ipapython.dn import DN
from ipapython import sysrestore, ipautil, ipaldap, p11helper

2
ipaserver/install/otpdinstance.py
View File

@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import service
from ipaserver.install import service
class OtpdInstance(service.SimpleServiceInstance):

4
ipatests/test_ipaserver/test_changepw.py
View File

@@ -18,13 +18,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import nose
import ldap
from httptest import Unauthorized_HTTP_test
from ipatests.test_ipaserver.httptest import Unauthorized_HTTP_test
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
from ipatests.util import assert_equal, assert_not_equal
from ipalib import api, errors
from ipapython.dn import DN
import ldap
testuser = u'tuser'
old_password = u'old_password'

5
ipatests/test_util.py
View File

@@ -22,8 +22,9 @@ Test the `tests.util` module.
"""
import re
import util
from util import raises, TYPE, VALUE, LEN, KEYS
from ipatests import util
from ipatests.util import raises, TYPE, VALUE, LEN, KEYS
class Prop(object):

2
ipatests/test_xmlrpc/test_attr.py
View File

@@ -22,7 +22,7 @@ Test --setattr and --addattr and other attribute-specific issues
"""
from ipalib import errors
from xmlrpc_test import Declarative
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
user1=u'tuser1'

5
ipatests/test_xmlrpc/test_automember_plugin.py
View File

@@ -24,8 +24,9 @@ Test the `ipalib/plugins/automember.py` module.
from ipalib import api, errors
from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, \
fuzzy_automember_dn, fuzzy_automember_message
from ipatests.test_xmlrpc.xmlrpc_test import (
Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_automember_dn,
fuzzy_automember_message)
from ipatests.test_xmlrpc.test_user_plugin import get_user_result

2
ipatests/test_xmlrpc/test_automount_plugin.py
View File

@@ -31,7 +31,7 @@ from ipalib import errors
from ipapython.dn import DN
from nose.tools import raises, assert_raises # pylint: disable=E0611
from xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipaplatform.paths import paths
from ipatests.util import assert_deepequal

3
ipatests/test_xmlrpc/test_batch_plugin.py
View File

@@ -24,7 +24,8 @@ Test the `ipalib/plugins/batch.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from ipatests.util import assert_equal, Fuzzy, assert_deepequal
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
group1 = u'testgroup1'

2
ipatests/test_xmlrpc/test_cert_plugin.py
View File

@@ -25,7 +25,7 @@ import os
import shutil
from nose.tools import raises, assert_raises # pylint: disable=E0611
from xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipalib import api
from ipalib import errors
from ipalib import x509

3
ipatests/test_xmlrpc/test_config_plugin.py
View File

@@ -22,7 +22,8 @@ Test the `ipalib/plugins/config.py` module.
"""
from ipalib import errors
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
class test_config(Declarative):

3
ipatests/test_xmlrpc/test_delegation_plugin.py
View File

@@ -23,7 +23,8 @@ Test the `ipalib/plugins/delegation.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
delegation1 = u'testdelegation'

3
ipatests/test_xmlrpc/test_dns_plugin.py
View File

@@ -26,7 +26,8 @@ from ipalib.util import normalize_zone
from ipapython.dnsutil import DNSName
from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
try:
from ipaserver.plugins.ldap2 import ldap2

2
ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
View File

@@ -27,7 +27,7 @@ from ipalib.util import normalize_zone
from ipapython.dn import DN
from ipapython.dnsutil import DNSName
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits
from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_digits
cn = u'Realm Domains'

3
ipatests/test_xmlrpc/test_external_members.py
View File

@@ -25,7 +25,8 @@ import nose
from ipalib import api
from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_uuid, fuzzy_user_or_group_sid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
fuzzy_user_or_group_sid)
group_name = u'external_group'
group_desc = u'Test external group'

4
ipatests/test_xmlrpc/test_group_plugin.py
View File

@@ -23,8 +23,8 @@ Test the `ipalib/plugins/group.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci,
add_sid, add_oc)
from ipatests.test_xmlrpc.xmlrpc_test import (
Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci, add_sid, add_oc)
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result

2
ipatests/test_xmlrpc/test_hbac_plugin.py
View File

@@ -22,7 +22,7 @@ Test the `ipalib/plugins/hbacrule.py` module.
from nose.tools import raises, assert_raises # pylint: disable=E0611
from xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipalib import api
from ipalib import errors

2
ipatests/test_xmlrpc/test_hbactest_plugin.py
View File

@@ -21,7 +21,7 @@
Test the `ipalib/plugins/hbactest.py` module.
"""
from xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipalib import api
from ipalib import errors
from types import NoneType

2
ipatests/test_xmlrpc/test_krbtpolicy.py
View File

@@ -21,7 +21,7 @@ Test kerberos ticket policy
"""
from ipalib import api, errors
from xmlrpc_test import Declarative
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result

3
ipatests/test_xmlrpc/test_nesting.py
View File

@@ -22,7 +22,8 @@ Test group nesting and indirect members
from ipalib import api
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result

4
ipatests/test_xmlrpc/test_netgroup_plugin.py
View File

@@ -27,8 +27,8 @@ import krbV
from ipalib import api
from ipalib import errors
from ipaserver.plugins.ldap2 import ldap2
from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid,
fuzzy_netgroupdn)
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid, fuzzy_netgroupdn)
from ipatests.test_xmlrpc import objectclasses
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result

3
ipatests/test_xmlrpc/test_old_permission_plugin.py
View File

@@ -27,7 +27,8 @@ http://www.freeipa.org/page/V3/Permissions_V2
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
permission1 = u'testperm'

2
ipatests/test_xmlrpc/test_passwd_plugin.py
View File

@@ -24,7 +24,7 @@ import sys
from nose.tools import assert_raises # pylint: disable=E0611
from xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipalib import api
from ipalib import errors

2
ipatests/test_xmlrpc/test_permission_plugin.py
View File

@@ -28,7 +28,7 @@ import nose
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipapython.dn import DN
import inspect

2
ipatests/test_xmlrpc/test_ping_plugin.py
View File

@@ -23,7 +23,7 @@ Test the `ipalib/plugins/ping.py` module, and XML-RPC in general.
from ipalib import api, errors, messages, _
from ipatests.util import Fuzzy
from xmlrpc_test import Declarative
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipapython.version import API_VERSION

3
ipatests/test_xmlrpc/test_privilege_plugin.py
View File

@@ -23,7 +23,8 @@ Test the `ipalib/plugins/privilege.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
permission1 = u'testperm'

2
ipatests/test_xmlrpc/test_range_plugin.py
View File

@@ -22,7 +22,7 @@ Test the `ipalib/plugins/idrange.py` module, and XML-RPC in general.
"""
from ipalib import api, errors
from xmlrpc_test import Declarative, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
from ipatests.test_xmlrpc import objectclasses
from ipatests.util import MockLDAP
from ipapython.dn import DN

2
ipatests/test_xmlrpc/test_realmdomains_plugin.py
View File

@@ -23,7 +23,7 @@ Test the `ipalib/plugins/realmdomains.py` module.
from ipalib import api, errors
from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
cn = u'Realm Domains'

2
ipatests/test_xmlrpc/test_replace.py
View File

@@ -25,7 +25,7 @@ Note that member management in other tests also exercises the
gen_modlist code.
"""
from xmlrpc_test import Declarative
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
user1=u'tuser1'

3
ipatests/test_xmlrpc/test_role_plugin.py
View File

@@ -24,7 +24,8 @@ Test the `ipalib/plugins/role.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
search = u'test-role'

3
ipatests/test_xmlrpc/test_selfservice_plugin.py
View File

@@ -23,7 +23,8 @@ Test the `ipalib/plugins/selfservice.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
selfservice1 = u'testself'
invalid_selfservice1 = u'bad+name'

3
ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
View File

@@ -22,7 +22,8 @@ Test the `ipalib/plugins/selinuxusermap.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
from ipatests.util import Fuzzy
from ipatests.test_xmlrpc.test_user_plugin import get_user_result

2
ipatests/test_xmlrpc/test_servicedelegation_plugin.py
View File

@@ -7,7 +7,7 @@ Test the `ipalib/plugins/serviceconstraint.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipapython.dn import DN
rule1 = u'test1'

3
ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
View File

@@ -22,7 +22,8 @@ Test the `ipalib/plugins/sudocmdgroup.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_uuid, fuzzy_sudocmddn
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
fuzzy_sudocmddn)
from ipapython.dn import DN
sudocmdgroup1 = u'testsudocmdgroup1'

2
ipatests/test_xmlrpc/test_sudorule_plugin.py
View File

@@ -23,7 +23,7 @@ Test the `ipalib/plugins/sudorule.py` module.
from nose.tools import raises, assert_raises # pylint: disable=E0611
from xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipalib import api
from ipalib import errors

5
ipatests/test_xmlrpc/test_trust_plugin.py
View File

@@ -24,8 +24,9 @@ import nose
from ipalib import api, errors
from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import (Declarative, fuzzy_guid, fuzzy_domain_sid, fuzzy_string,
fuzzy_uuid, fuzzy_digits)
from ipatests.test_xmlrpc.xmlrpc_test import (
Declarative, fuzzy_guid, fuzzy_domain_sid, fuzzy_string, fuzzy_uuid,
fuzzy_digits)
trustconfig_ad_config = DN(('cn', api.env.domain),

6
ipatests/test_xmlrpc/test_user_plugin.py
View File

@@ -30,9 +30,9 @@ import re
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from ipatests.util import assert_equal, assert_not_equal, raises
from xmlrpc_test import (XMLRPC_test, Declarative, fuzzy_digits, fuzzy_uuid,
fuzzy_password, fuzzy_string, fuzzy_dergeneralizedtime,
add_sid, add_oc)
from ipatests.test_xmlrpc.xmlrpc_test import (
XMLRPC_test, Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_password,
fuzzy_string, fuzzy_dergeneralizedtime, add_sid, add_oc)
from ipapython.dn import DN
user1 = u'tuser1'

2
ipatests/test_xmlrpc/test_vault_plugin.py
View File

@@ -23,7 +23,7 @@ Test the `ipalib/plugins/vault.py` module.
import nose
from ipalib import api, errors
from xmlrpc_test import Declarative, fuzzy_string
from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_string
vault_name = u'test_vault'
service_name = u'HTTP/server.example.com'