PEP8: fix E401: multiple imports on one line

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

13 files changed, 37 insertions, 14 deletions

diff --git a/python/samba/drs_utils.py b/python/samba/drs_utils.py
index 8b812e43b86..4db8fa00a58 100644
--- a/python/samba/drs_utils.py
+++ b/python/samba/drs_utils.py
@@ -23,7 +23,8 @@ from samba.ndr import ndr_unpack
 from samba import dsdb
 from samba import werror
 from samba import WERRORError
-import samba, ldb
+import samba
+import ldb
 from samba.dcerpc.drsuapi import DRSUAPI_ATTID_name
 import re
 
diff --git a/python/samba/join.py b/python/samba/join.py
index dd8aca9e567..803379746e1 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -22,7 +22,10 @@ from __future__ import print_function
 from samba.auth import system_session
 from samba.samdb import SamDB
 from samba import gensec, Ldb, drs_utils, arcfour_encrypt, string_to_byte_array
-import ldb, samba, sys, uuid
+import ldb
+import samba
+import sys
+import uuid
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.dcerpc import security, drsuapi, misc, nbt, lsa, drsblobs, dnsserver, dnsp
 from samba.dsdb import DS_DOMAIN_FUNCTION_2003
diff --git a/python/samba/netcmd/__init__.py b/python/samba/netcmd/__init__.py
index 6e133591155..3c785a1d5dc 100644
--- a/python/samba/netcmd/__init__.py
+++ b/python/samba/netcmd/__init__.py
@@ -16,11 +16,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import optparse, samba
+import optparse
+import samba
 from samba import getopt as options
 from samba import colour
 from ldb import LdbError
-import sys, traceback
+import sys
+import traceback
 import textwrap
 
 
diff --git a/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py
index fe29d18dbf9..3a940bf6d6a 100644
--- a/python/samba/netcmd/dbcheck.py
+++ b/python/samba/netcmd/dbcheck.py
@@ -16,7 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import ldb, sys
+import ldb
+import sys
 import samba.getopt as options
 from samba.auth import system_session
 from samba.samdb import SamDB
diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py
index 9b592629296..620ec77d48b 100644
--- a/python/samba/ntacls.py
+++ b/python/samba/ntacls.py
@@ -25,7 +25,9 @@ import tarfile
 import tempfile
 import shutil
 
-import samba.xattr_native, samba.xattr_tdb, samba.posix_eadb
+import samba.xattr_native
+import samba.xattr_tdb
+import samba.posix_eadb
 from samba.samba3 import param as s3param
 from samba.dcerpc import security, xattr, idmap
 from samba.ndr import ndr_pack, ndr_unpack
diff --git a/python/samba/tests/blackbox/samba_dnsupdate.py b/python/samba/tests/blackbox/samba_dnsupdate.py
index 26496740bb4..56416330e72 100644
--- a/python/samba/tests/blackbox/samba_dnsupdate.py
+++ b/python/samba/tests/blackbox/samba_dnsupdate.py
@@ -23,7 +23,8 @@ from samba.credentials import Credentials
 from samba.auth import system_session
 from samba.samdb import SamDB
 import ldb
-import shutil, os
+import shutil
+import os
 
 
 class SambaDnsUpdateTests(samba.tests.BlackboxTestCase):
diff --git a/python/samba/tests/common.py b/python/samba/tests/common.py
index 146c6a8de9d..11510b63be7 100644
--- a/python/samba/tests/common.py
+++ b/python/samba/tests/common.py
@@ -17,7 +17,8 @@
 
 """Tests for samba.common"""
 
-import samba, os
+import samba
+import os
 import samba.tests
 from samba.common import *
 from samba.samdb import SamDB
diff --git a/python/samba/tests/dckeytab.py b/python/samba/tests/dckeytab.py
index 239d3113dad..3149828c4dd 100644
--- a/python/samba/tests/dckeytab.py
+++ b/python/samba/tests/dckeytab.py
@@ -16,7 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import os, sys, string
+import os
+import sys
+import string
 from samba.net import Net
 import samba.dckeytab
 from samba import tests
diff --git a/python/samba/tests/netbios.py b/python/samba/tests/netbios.py
index 82a0ef528ba..61457c6aa7f 100644
--- a/python/samba/tests/netbios.py
+++ b/python/samba/tests/netbios.py
@@ -15,7 +15,10 @@
 # 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 samba, os, random, sys
+import samba
+import os
+import random
+import sys
 from samba import netbios
 
 
diff --git a/python/samba/tests/samba_tool/fsmo.py b/python/samba/tests/samba_tool/fsmo.py
index ef475e89c69..eb2116acb57 100644
--- a/python/samba/tests/samba_tool/fsmo.py
+++ b/python/samba/tests/samba_tool/fsmo.py
@@ -15,7 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import os, ldb
+import os
+import ldb
 from samba.tests.samba_tool.base import SambaToolCmdTest
 
 
diff --git a/python/samba/tests/samba_tool/join.py b/python/samba/tests/samba_tool/join.py
index 8491f092658..3c3449b8e9e 100644
--- a/python/samba/tests/samba_tool/join.py
+++ b/python/samba/tests/samba_tool/join.py
@@ -15,7 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import os, ldb
+import os
+import ldb
 from samba.tests.samba_tool.base import SambaToolCmdTest
 
 
diff --git a/python/samba/tests/smb.py b/python/samba/tests/smb.py
index 559bb2558a4..8f6b13193f5 100644
--- a/python/samba/tests/smb.py
+++ b/python/samba/tests/smb.py
@@ -15,7 +15,10 @@
 # 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 samba, os, random, sys
+import samba
+import os
+import random
+import sys
 from samba import smb
 
 PY3 = sys.version_info[0] == 3
diff --git a/python/samba/tests/xattr.py b/python/samba/tests/xattr.py
index c137dd58484..5943464c047 100644
--- a/python/samba/tests/xattr.py
+++ b/python/samba/tests/xattr.py
@@ -17,7 +17,9 @@
 
 """Tests for samba.xattr_native and samba.xattr_tdb."""
 
-import samba.xattr_native, samba.xattr_tdb, samba.posix_eadb
+import samba.xattr_native
+import samba.xattr_tdb
+import samba.posix_eadb
 from samba.xattr import copytree_with_xattrs
 from samba.dcerpc import xattr
 from samba.ndr import ndr_pack