summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2016-05-03 15:53:12 +0200
committerMartin Basti <mbasti@redhat.com>2016-05-10 12:41:15 +0200
commita9a13530988c616b331545ea02f539d39df64e27 (patch)
treec15e1ccd86b41534cfa88ed8a2c9e3d0706564b6
parent475547fa40f6244ce838b8ce30e77cf32ee250be (diff)
downloadfreeipa-a9a13530988c616b331545ea02f539d39df64e27.tar.gz
freeipa-a9a13530988c616b331545ea02f539d39df64e27.tar.xz
freeipa-a9a13530988c616b331545ea02f539d39df64e27.zip
Fix remaining relative import and enable Pylint check
Relative imports are not supported in Python 3. Part of the work for: https://fedorahosted.org/freeipa/ticket/4985 Reviewed-By: Martin Basti <mbasti@redhat.com>
-rw-r--r--ipaserver/install/custodiainstance.py2
-rw-r--r--pylintrc1
2 files changed, 1 insertions, 2 deletions
diff --git a/ipaserver/install/custodiainstance.py b/ipaserver/install/custodiainstance.py
index 424e0797b..d5c5bf738 100644
--- a/ipaserver/install/custodiainstance.py
+++ b/ipaserver/install/custodiainstance.py
@@ -4,7 +4,7 @@ from ipapython.secrets.kem import IPAKEMKeys
from ipapython.secrets.client import CustodiaClient
from ipaplatform.paths import paths
from ipaplatform.constants import constants
-from service import SimpleServiceInstance
+from ipaserver.install.service import SimpleServiceInstance
from ipapython import ipautil
from ipapython.ipa_log_manager import root_logger
from ipaserver.install import installutils
diff --git a/pylintrc b/pylintrc
index 424d76249..7ef441844 100644
--- a/pylintrc
+++ b/pylintrc
@@ -39,7 +39,6 @@ disable=
redefine-in-handler,
redefined-builtin,
redefined-outer-name,
- relative-import,
super-init-not-called,
undefined-loop-variable,
unnecessary-lambda,