Avoid use of parentheses in Python import statements, as it's not supported by Python2.3.

diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index 71fd98876eb1248faab2aa51cb3c59aa5013e94e..37a874a7082311462dff4509d639dcff28790a51 100755 (executable)
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -13,10 +13,10 @@ sys.path.append("../lib/subunit/python")
 import samba.getopt as options
 
 from samba.auth import system_session
-from ldb import (SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError,
-                 LDB_ERR_NO_SUCH_OBJECT, LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS,
-                 LDB_ERR_ENTRY_ALREADY_EXISTS, LDB_ERR_UNWILLING_TO_PERFORM,
-                 LDB_ERR_NOT_ALLOWED_ON_NON_LEAF, LDB_ERR_OTHER, LDB_ERR_INVALID_DN_SYNTAX)
+from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
+from ldb import LDB_ERR_NO_SUCH_OBJECT, LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS
+from ldb import LDB_ERR_ENTRY_ALREADY_EXISTS, LDB_ERR_UNWILLING_TO_PERFORM
+from ldb import LDB_ERR_NOT_ALLOWED_ON_NON_LEAF, LDB_ERR_OTHER, LDB_ERR_INVALID_DN_SYNTAX
 from samba import Ldb
 from subunit import SubunitTestRunner
 from samba import param

diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index 1755cbdcf06678242e53103c5146df11b56bf834..95a9fc2b566be31439fba098faf241c65ece3317 100644 (file)
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -18,8 +18,8 @@
 #
 
 import unittest
-from samba.samba3 import (GroupMappingDatabase, Registry, PolicyDatabase, SecretsDatabase, TdbSam,
-                          WinsDatabase, SmbpasswdFile, ACB_NORMAL, IdmapDatabase, SAMUser)
+from samba.samba3 import GroupMappingDatabase, Registry, PolicyDatabase, SecretsDatabase, TdbSam
+from samba.samba3 import WinsDatabase, SmbpasswdFile, ACB_NORMAL, IdmapDatabase, SAMUser
 import os
 
 DATADIR=os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3")

diff --git a/source4/setup/provision b/source4/setup/provision
index bf6898faa8c8b08cc30e1c03ea2216d9b389f58a..4b48bab676e14b0a81f08e2c5ab7e6992c1c24e5 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -35,9 +35,7 @@ from samba.credentials import DONT_USE_KERBEROS
 from samba.auth import system_session
 import samba.getopt as options
 from samba import param
-from samba.provision import (provision, 
-                             FILL_FULL, FILL_NT4SYNC,
-                             FILL_DRS)
+from samba.provision import provision, FILL_FULL, FILL_NT4SYNC, FILL_DRS
 
 # how do we make this case insensitive??
 

diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index 0943da29b616bd2cfc3b0271c635cabff67e67d2..7d20ef520234f337bc3a1dfec9d3ec44f4a969f8 100755 (executable)
--- a/source4/setup/provision-backend
+++ b/source4/setup/provision-backend
@@ -34,7 +34,7 @@ from samba import param
 
 from samba.auth import system_session
 import samba.getopt as options
-from samba.provision import (provision_backend)
+from samba.provision import provision_backend
 
 parser = optparse.OptionParser("provision [options]")
 sambaopts = options.SambaOptions(parser)