diff options
author | Martin Basti <mbasti@redhat.com> | 2015-12-16 19:04:20 +0100 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2015-12-23 07:59:22 +0100 |
commit | e1192ebd975bc17aa600030eecbaed6660dc7733 (patch) | |
tree | 1a623cb4b003c234beae8075f437b8c936a4fd0f /ipalib/plugins | |
parent | e4075b1fe26a608cd1f3778ee1f655a5f5700c65 (diff) | |
download | freeipa-e1192ebd975bc17aa600030eecbaed6660dc7733.tar.gz freeipa-e1192ebd975bc17aa600030eecbaed6660dc7733.tar.xz freeipa-e1192ebd975bc17aa600030eecbaed6660dc7733.zip |
Remove wildcard imports
Wildcard imports should not be used.
Check for wildcard imports has been enabled in pylint.
Pylint note: options 'wildcard-import' causes too much false positive
results, so instead it I used 'unused-wildcard-import' option which has almost
the same effect.
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipalib/plugins')
-rw-r--r-- | ipalib/plugins/aci.py | 2 | ||||
-rw-r--r-- | ipalib/plugins/automember.py | 13 | ||||
-rw-r--r-- | ipalib/plugins/automount.py | 11 | ||||
-rw-r--r-- | ipalib/plugins/cert.py | 3 | ||||
-rw-r--r-- | ipalib/plugins/config.py | 7 | ||||
-rw-r--r-- | ipalib/plugins/dns.py | 15 | ||||
-rw-r--r-- | ipalib/plugins/group.py | 20 | ||||
-rw-r--r-- | ipalib/plugins/hbacrule.py | 15 | ||||
-rw-r--r-- | ipalib/plugins/hbacsvcgroup.py | 12 | ||||
-rw-r--r-- | ipalib/plugins/netgroup.py | 17 | ||||
-rw-r--r-- | ipalib/plugins/privilege.py | 15 | ||||
-rw-r--r-- | ipalib/plugins/pwpolicy.py | 9 | ||||
-rw-r--r-- | ipalib/plugins/radiusproxy.py | 9 | ||||
-rw-r--r-- | ipalib/plugins/role.py | 13 | ||||
-rw-r--r-- | ipalib/plugins/selinuxusermap.py | 16 | ||||
-rw-r--r-- | ipalib/plugins/server.py | 7 | ||||
-rw-r--r-- | ipalib/plugins/service.py | 21 | ||||
-rw-r--r-- | ipalib/plugins/servicedelegation.py | 11 | ||||
-rw-r--r-- | ipalib/plugins/sudocmd.py | 9 | ||||
-rw-r--r-- | ipalib/plugins/sudocmdgroup.py | 10 | ||||
-rw-r--r-- | ipalib/plugins/trust.py | 15 | ||||
-rw-r--r-- | ipalib/plugins/user.py | 15 |
22 files changed, 235 insertions, 30 deletions
diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py index 8fe382f38..60dbcee7f 100644 --- a/ipalib/plugins/aci.py +++ b/ipalib/plugins/aci.py @@ -129,7 +129,7 @@ from ipalib import output from ipalib import _, ngettext from ipalib.plugable import Registry from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value -from ipapython.ipa_log_manager import * +from ipapython.ipa_log_manager import root_logger from ipapython.dn import DN if six.PY3: diff --git a/ipalib/plugins/automember.py b/ipalib/plugins/automember.py index a45fab07b..3135e3e95 100644 --- a/ipalib/plugins/automember.py +++ b/ipalib/plugins/automember.py @@ -22,9 +22,18 @@ import time import ldap as _ldap import six -from ipalib import api, errors, Str, StrEnum, DNParam, _, ngettext +from ipalib import api, errors, Str, StrEnum, DNParam, Flag, _, ngettext +from ipalib import output, Command from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + pkey_to_value, + entry_to_dict, + LDAPObject, + LDAPCreate, + LDAPUpdate, + LDAPDelete, + LDAPSearch, + LDAPRetrieve) from ipalib.request import context from ipapython.dn import DN diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py index 5e04a6b93..91a0613bb 100644 --- a/ipalib/plugins/automount.py +++ b/ipalib/plugins/automount.py @@ -25,8 +25,17 @@ import six from ipalib import api, errors from ipalib import Flag, Str, IA5Str from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + pkey_to_value, + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPQuery, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve) from ipalib import _, ngettext +from ipapython.dn import DN if six.PY3: unicode = str diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py index 615f7ac25..dd27bfb63 100644 --- a/ipalib/plugins/cert.py +++ b/ipalib/plugins/cert.py @@ -31,7 +31,7 @@ from ipalib import x509 from ipalib import util from ipalib import ngettext from ipalib.plugable import Registry -from ipalib.plugins.virtual import * +from ipalib.plugins.virtual import VirtualCommand from ipalib.plugins.baseldap import pkey_to_value from ipalib.plugins.service import split_any_principal from ipalib.plugins.certprofile import validate_profile_id @@ -40,6 +40,7 @@ from ipalib.text import _ from ipalib.request import context from ipalib import output from ipalib.plugins.service import validate_principal +from ipapython.dn import DN import six import nss.nss as nss diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py index 055a8211b..4c8c2dd44 100644 --- a/ipalib/plugins/config.py +++ b/ipalib/plugins/config.py @@ -20,10 +20,15 @@ from ipalib import api from ipalib import Bool, Int, Str, IA5Str, StrEnum, DNParam +from ipalib import errors from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + LDAPObject, + LDAPUpdate, + LDAPRetrieve) from ipalib.plugins.selinuxusermap import validate_selinuxuser from ipalib import _ +from ipapython.dn import DN # 389-ds attributes that should be skipped in attribute checks OPERATIONAL_ATTRIBUTES = ('nsaccountlock', 'member', 'memberof', diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index 60c992026..d5448c879 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -36,11 +36,21 @@ import six from ipalib.request import context from ipalib import api, errors, output from ipalib import Command -from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES +from ipalib.capabilities import ( + VERSION_WITHOUT_CAPABILITIES, + client_has_capability) from ipalib.parameters import (Flag, Bool, Int, Decimal, Str, StrEnum, Any, DeprecatedParam, DNSNameParam) from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + pkey_to_value, + LDAPObject, + LDAPCreate, + LDAPUpdate, + LDAPSearch, + LDAPQuery, + LDAPDelete, + LDAPRetrieve) from ipalib import _, ngettext from ipalib import messages from ipalib.util import (normalize_zonemgr, @@ -53,6 +63,7 @@ from ipalib.util import (normalize_zonemgr, validate_dnssec_zone_forwarder_step1, validate_dnssec_zone_forwarder_step2, verify_host_resolvable) +from ipapython.dn import DN from ipapython.ipautil import CheckedIPAddress, check_zone_overlap from ipapython.dnsutil import DNSName diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py index 64a135e01..85ed1d2b0 100644 --- a/ipalib/plugins/group.py +++ b/ipalib/plugins/group.py @@ -21,12 +21,28 @@ import six from ipalib import api -from ipalib import Int, Str +from ipalib import Int, Str, Flag from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + add_external_post_callback, + pkey_to_value, + remove_external_post_callback, + LDAPObject, + LDAPCreate, + LDAPUpdate, + LDAPDelete, + LDAPSearch, + LDAPRetrieve, + LDAPAddMember, + LDAPRemoveMember, + LDAPQuery, +) from ipalib.plugins.idviews import remove_ipaobject_overrides from ipalib.plugins import baseldap from ipalib import _, ngettext +from ipalib import errors +from ipalib import output +from ipapython.dn import DN if six.PY3: unicode = str diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py index aa0e79c17..54487eded 100644 --- a/ipalib/plugins/hbacrule.py +++ b/ipalib/plugins/hbacrule.py @@ -20,8 +20,21 @@ from ipalib import api, errors from ipalib import AccessTime, Str, StrEnum, Bool, DeprecatedParam from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + pkey_to_value, + external_host_param, + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPRetrieve, + LDAPUpdate, + LDAPSearch, + LDAPQuery, + LDAPAddMember, + LDAPRemoveMember) from ipalib import _, ngettext +from ipalib import output +from ipapython.dn import DN __doc__ = _(""" Host-based access control diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py index 71df7fdbc..e7feb1496 100644 --- a/ipalib/plugins/hbacsvcgroup.py +++ b/ipalib/plugins/hbacsvcgroup.py @@ -17,9 +17,17 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from ipalib import api +from ipalib import api, Str from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + LDAPObject, + LDAPCreate, + LDAPUpdate, + LDAPRetrieve, + LDAPSearch, + LDAPDelete, + LDAPAddMember, + LDAPRemoveMember) from ipalib import _, ngettext __doc__ = _(""" diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py index fe85889de..b56889203 100644 --- a/ipalib/plugins/netgroup.py +++ b/ipalib/plugins/netgroup.py @@ -21,11 +21,24 @@ import six from ipalib import api, errors -from ipalib import Str, StrEnum +from ipalib import Str, StrEnum, Flag from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + external_host_param, + add_external_pre_callback, + add_external_post_callback, + remove_external_post_callback, + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve, + LDAPAddMember, + LDAPRemoveMember) from ipalib import _, ngettext from ipalib.plugins.hbacrule import is_all +from ipapython.dn import DN if six.PY3: unicode = str diff --git a/ipalib/plugins/privilege.py b/ipalib/plugins/privilege.py index ffb903e03..b455b2641 100644 --- a/ipalib/plugins/privilege.py +++ b/ipalib/plugins/privilege.py @@ -17,9 +17,22 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve, + LDAPAddMember, + LDAPRemoveMember, + LDAPAddReverseMember, + LDAPRemoveReverseMember) from ipalib import api, _, ngettext, errors from ipalib.plugable import Registry +from ipalib import Str +from ipalib import output +from ipapython.dn import DN __doc__ = _(""" Privileges diff --git a/ipalib/plugins/pwpolicy.py b/ipalib/plugins/pwpolicy.py index 7bd3c0984..e99ea852e 100644 --- a/ipalib/plugins/pwpolicy.py +++ b/ipalib/plugins/pwpolicy.py @@ -20,7 +20,14 @@ from ipalib import api from ipalib import Int, Str, DNParam -from ipalib.plugins.baseldap import * +from ipalib import errors +from ipalib.plugins.baseldap import ( + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPRetrieve, + LDAPSearch) from ipalib import _ from ipalib.plugable import Registry from ipalib.request import context diff --git a/ipalib/plugins/radiusproxy.py b/ipalib/plugins/radiusproxy.py index e30f35f9d..2a66436f5 100644 --- a/ipalib/plugins/radiusproxy.py +++ b/ipalib/plugins/radiusproxy.py @@ -17,8 +17,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve) from ipalib import api, Str, Int, Password, _, ngettext +from ipalib import errors from ipalib.plugable import Registry from ipalib.util import validate_hostname, validate_ipaddr from ipalib.errors import ValidationError diff --git a/ipalib/plugins/role.py b/ipalib/plugins/role.py index 82e2a5571..b959e0e40 100644 --- a/ipalib/plugins/role.py +++ b/ipalib/plugins/role.py @@ -19,8 +19,19 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve, + LDAPAddMember, + LDAPRemoveMember, + LDAPAddReverseMember, + LDAPRemoveReverseMember) from ipalib import api, Str, _, ngettext +from ipalib import output __doc__ = _(""" Roles diff --git a/ipalib/plugins/selinuxusermap.py b/ipalib/plugins/selinuxusermap.py index e1a16af50..e5c2caa77 100644 --- a/ipalib/plugins/selinuxusermap.py +++ b/ipalib/plugins/selinuxusermap.py @@ -17,12 +17,26 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import re + from ipalib import api, errors from ipalib import Str, StrEnum, Bool from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + pkey_to_value, + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve, + LDAPQuery, + LDAPAddMember, + LDAPRemoveMember) from ipalib import _, ngettext +from ipalib import output from ipalib.plugins.hbacrule import is_all +from ipapython.dn import DN __doc__ = _(""" SELinux User Mapping diff --git a/ipalib/plugins/server.py b/ipalib/plugins/server.py index 4f1959a25..e31def77c 100644 --- a/ipalib/plugins/server.py +++ b/ipalib/plugins/server.py @@ -8,9 +8,14 @@ import dbus.mainloop.glib from ipalib import api, crud, errors, messages from ipalib import Int, Str from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + LDAPSearch, + LDAPRetrieve, + LDAPDelete, + LDAPObject) from ipalib.request import context from ipalib import _, ngettext +from ipalib import output __doc__ = _(""" IPA servers diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index 4ef4d4362..5daede14f 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -22,12 +22,29 @@ import six from ipalib import api, errors -from ipalib import Bytes, StrEnum, Bool +from ipalib import Bytes, StrEnum, Bool, Str, Flag from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + host_is_master, + add_missing_object_class, + pkey_to_value, + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve, + LDAPAddMember, + LDAPRemoveMember, + LDAPQuery, + LDAPAddAttribute, + LDAPRemoveAttribute) from ipalib import x509 from ipalib import _, ngettext from ipalib import util +from ipalib import output +from ipapython.dn import DN + import nss.nss as nss diff --git a/ipalib/plugins/servicedelegation.py b/ipalib/plugins/servicedelegation.py index 2ce11191b..3637b9180 100644 --- a/ipalib/plugins/servicedelegation.py +++ b/ipalib/plugins/servicedelegation.py @@ -7,9 +7,18 @@ import six from ipalib import api from ipalib import Str from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + LDAPObject, + LDAPAddMember, + LDAPRemoveMember, + LDAPCreate, + LDAPDelete, + LDAPSearch, + LDAPRetrieve) from ipalib.plugins.service import normalize_principal from ipalib import _, ngettext +from ipalib import errors +from ipapython.dn import DN if six.PY3: unicode = str diff --git a/ipalib/plugins/sudocmd.py b/ipalib/plugins/sudocmd.py index 37776adc0..179b43fcd 100644 --- a/ipalib/plugins/sudocmd.py +++ b/ipalib/plugins/sudocmd.py @@ -20,8 +20,15 @@ from ipalib import api, errors from ipalib import Str from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve) from ipalib import _, ngettext +from ipapython.dn import DN __doc__ = _(""" Sudo Commands diff --git a/ipalib/plugins/sudocmdgroup.py b/ipalib/plugins/sudocmdgroup.py index 74bbaf095..f35bc8d26 100644 --- a/ipalib/plugins/sudocmdgroup.py +++ b/ipalib/plugins/sudocmdgroup.py @@ -20,7 +20,15 @@ from ipalib import api from ipalib import Str from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + LDAPObject, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve, + LDAPAddMember, + LDAPRemoveMember) from ipalib import _, ngettext __doc__ = _(""" diff --git a/ipalib/plugins/trust.py b/ipalib/plugins/trust.py index 61846dc11..bc347675a 100644 --- a/ipalib/plugins/trust.py +++ b/ipalib/plugins/trust.py @@ -21,13 +21,24 @@ import six from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + pkey_to_value, + entry_to_dict, + LDAPCreate, + LDAPDelete, + LDAPUpdate, + LDAPSearch, + LDAPRetrieve, + LDAPObject, + LDAPQuery) from ipalib.plugins.dns import dns_container_exists +from ipapython.dn import DN from ipapython.ipautil import realm_to_suffix from ipapython.ipa_log_manager import root_logger -from ipalib import api, Str, StrEnum, Password, Bool, _, ngettext +from ipalib import api, Str, StrEnum, Password, Bool, _, ngettext, Int, Flag from ipalib import Command from ipalib import errors +from ipalib import output from ldap import SCOPE_SUBTREE from time import sleep diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 0017c09d7..97ba4d321 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -18,14 +18,17 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import time from time import gmtime, strftime import posixpath import os import six +from ipalib import api +from ipalib import errors from ipalib import util -from ipalib import Bool +from ipalib import Bool, Flag, Str from ipalib.plugins.baseuser import ( baseuser, baseuser_add, @@ -45,13 +48,21 @@ from ipalib.plugins.baseuser import ( baseuser_remove_manager) from ipalib.plugins.idviews import remove_ipaobject_overrides from ipalib.plugable import Registry -from ipalib.plugins.baseldap import * +from ipalib.plugins.baseldap import ( + pkey_to_value, + LDAPCreate, + LDAPSearch, + LDAPQuery, + LDAPMultiQuery, + LDAPAddAttribute, + LDAPRemoveAttribute) from ipalib.plugins import baseldap from ipalib.request import context from ipalib import _, ngettext from ipalib import output from ipalib import x509 from ipaplatform.paths import paths +from ipapython.dn import DN from ipapython.ipautil import ipa_generate_password from ipalib.capabilities import client_has_capability |