summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2016-03-20 21:21:10 +0100
committerMartin Basti <mbasti@redhat.com>2016-03-22 10:20:51 +0100
commitb66028af1815fbf7666b82ebeaa81ad56996a74f (patch)
treef6ae8c2ba6916fb02d67df95d1b2943d8dfd79e4
parent195e50b93b63e4f30ce83dbcfef278727d48aea2 (diff)
downloadfreeipa-b66028af1815fbf7666b82ebeaa81ad56996a74f.tar.gz
freeipa-b66028af1815fbf7666b82ebeaa81ad56996a74f.tar.xz
freeipa-b66028af1815fbf7666b82ebeaa81ad56996a74f.zip
Pylint: import max one module per line
Reviewed-By: Petr Spacek <pspacek@redhat.com> Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com>
-rwxr-xr-xinstall/oddjob/com.redhat.idm.trust-fetch-domains3
-rw-r--r--ipalib/plugins/trust.py3
-rw-r--r--ipapython/ipautil.py3
-rw-r--r--ipaserver/dcerpc.py3
-rw-r--r--ipaserver/install/service.py3
-rw-r--r--ipaserver/plugins/dogtag.py3
-rw-r--r--pylintrc1
7 files changed, 12 insertions, 7 deletions
diff --git a/install/oddjob/com.redhat.idm.trust-fetch-domains b/install/oddjob/com.redhat.idm.trust-fetch-domains
index ea82e086e..6e8bfc6c8 100755
--- a/install/oddjob/com.redhat.idm.trust-fetch-domains
+++ b/install/oddjob/com.redhat.idm.trust-fetch-domains
@@ -9,7 +9,8 @@ from ipalib.config import Env
from ipalib.constants import DEFAULT_CONFIG
from ipapython.ipautil import kinit_keytab
import sys
-import os, pwd
+import os
+import pwd
import six
import gssapi
diff --git a/ipalib/plugins/trust.py b/ipalib/plugins/trust.py
index 7d815fd61..6d6ac6096 100644
--- a/ipalib/plugins/trust.py
+++ b/ipalib/plugins/trust.py
@@ -64,7 +64,8 @@ if api.env.in_server and api.env.context in ['lite', 'server']:
try:
import ipaserver.dcerpc #pylint: disable=F0401
from ipaserver.dcerpc import TRUST_ONEWAY, TRUST_BIDIRECTIONAL
- import dbus, dbus.mainloop.glib
+ import dbus
+ import dbus.mainloop.glib
_bindings_installed = True
except ImportError:
_bindings_installed = False
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 392e1f6db..d705c51f8 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -23,7 +23,8 @@ import string
import tempfile
import subprocess
import random
-import os, sys
+import os
+import sys
import copy
import stat
import shutil
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index a93e8ddb2..25ffbfaea 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -33,7 +33,8 @@ from ipapython.dn import DN
from ipaserver.install import installutils
from ipalib.util import normalize_name
-import os, struct
+import os
+import struct
from samba import param
from samba import credentials
from samba.dcerpc import security, lsa, drsblobs, nbt, netlogon
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 636c3cdd1..40767acd5 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -18,7 +18,8 @@
#
import sys
-import os, socket
+import os
+import socket
import tempfile
import datetime
import traceback
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py
index 5e358d231..3e5a07de4 100644
--- a/ipaserver/plugins/dogtag.py
+++ b/ipaserver/plugins/dogtag.py
@@ -1272,7 +1272,8 @@ from ipalib import api, errors, SkipPluginModule
if api.env.ra_plugin != 'dogtag':
# In this case, abort loading this plugin module...
raise SkipPluginModule(reason='dogtag not selected as RA plugin')
-import os, random
+import os
+import random
from ipaserver.plugins import rabase
from ipalib.constants import TYPE_ERROR
from ipalib.util import cachedproperty
diff --git a/pylintrc b/pylintrc
index d75ca13de..611df901d 100644
--- a/pylintrc
+++ b/pylintrc
@@ -57,7 +57,6 @@ disable=
invalid-name,
line-too-long,
missing-docstring,
- multiple-imports,
multiple-statements,
old-style-class,
superfluous-parens,