diff options
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/certdb.py | 6 | ||||
| -rw-r--r-- | ipapython/config.py | 2 | ||||
| -rw-r--r-- | ipapython/cookie.py | 2 | ||||
| -rw-r--r-- | ipapython/dogtag.py | 2 | ||||
| -rw-r--r-- | ipapython/ipaldap.py | 2 |
5 files changed, 12 insertions, 2 deletions
diff --git a/ipapython/certdb.py b/ipapython/certdb.py index 5389e6344..6c89e7780 100644 --- a/ipapython/certdb.py +++ b/ipapython/certdb.py @@ -32,10 +32,12 @@ from nss.error import NSPRError from ipapython.dn import DN from ipapython.ipa_log_manager import root_logger from ipapython import ipautil -from ipalib import x509 +from ipalib import x509 # pylint: disable=ipa-forbidden-import try: - from ipaplatform.paths import paths # pylint: disable=import-error + # pylint: disable=import-error,ipa-forbidden-import + from ipaplatform.paths import paths + # pylint: enable=import-error,ipa-forbidden-import except ImportError: CERTUTIL = '/usr/bin/certutil' PK12UTIL = '/usr/bin/pk12util' diff --git a/ipapython/config.py b/ipapython/config.py index b983a720c..9db2dcd4d 100644 --- a/ipapython/config.py +++ b/ipapython/config.py @@ -35,7 +35,9 @@ from six.moves.urllib.parse import urlsplit from ipapython.dn import DN try: + # pylint: disable=ipa-forbidden-import from ipaplatform.paths import paths + # pylint: enable=ipa-forbidden-import except ImportError: IPA_DEFAULT_CONF = '/etc/ipa/default.conf' else: diff --git a/ipapython/cookie.py b/ipapython/cookie.py index 9797fc184..4d8ef2c1a 100644 --- a/ipapython/cookie.py +++ b/ipapython/cookie.py @@ -599,7 +599,9 @@ class Cookie(object): # FIXME: At the moment we can't import from ipalib at the # module level because of a dependency loop (cycle) in the # import. Our module layout needs to be refactored. + # pylint: disable=ipa-forbidden-import from ipalib.util import validate_domain_name + # pylint: enable=ipa-forbidden-import try: validate_domain_name(url_domain) except Exception: diff --git a/ipapython/dogtag.py b/ipapython/dogtag.py index ff7dc4464..48232a9d1 100644 --- a/ipapython/dogtag.py +++ b/ipapython/dogtag.py @@ -25,10 +25,12 @@ import six from six.moves.urllib.parse import urlencode # pylint: enable=import-error +# pylint: disable=ipa-forbidden-import from ipalib import api, errors from ipalib.util import create_https_connection from ipalib.errors import NetworkError from ipalib.text import _ +# pylint: enable=ipa-forbidden-import from ipapython import ipautil from ipapython.ipa_log_manager import root_logger diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py index b15859892..1b0aaddd6 100644 --- a/ipapython/ipaldap.py +++ b/ipapython/ipaldap.py @@ -39,8 +39,10 @@ import ldap.filter from ldap.controls import SimplePagedResultsControl import six +# pylint: disable=ipa-forbidden-import from ipalib import errors, _ from ipalib.constants import LDAP_GENERALIZED_TIME_FORMAT +# pylint: enable=ipa-forbidden-import from ipapython.ipautil import format_netloc, CIDict from ipapython.ipa_log_manager import log_mgr from ipapython.dn import DN |
