summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-19 21:47:31 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-19 21:47:31 +0100
commit6998ef4fe021ebf40f63c2191d3259888a8ad7f4 (patch)
tree898e1ec849e5fa2b8987d8c50fc1b8ace4957eac
parentaf138af9e25cb9a362f8a67018645cfb30446d5a (diff)
downloadsamba-6998ef4fe021ebf40f63c2191d3259888a8ad7f4.tar.gz
samba-6998ef4fe021ebf40f63c2191d3259888a8ad7f4.tar.bz2
samba-6998ef4fe021ebf40f63c2191d3259888a8ad7f4.zip
Avoid use of parentheses in Python import statements, as it's not supported by Python2.3.
-rwxr-xr-xsource4/lib/ldb/tests/python/ldap.py8
-rw-r--r--source4/scripting/python/samba/tests/samba3.py4
-rwxr-xr-xsource4/setup/provision4
-rwxr-xr-xsource4/setup/provision-backend2
4 files changed, 8 insertions, 10 deletions
diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index 71fd98876e..37a874a708 100755
--- 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 1755cbdcf0..95a9fc2b56 100644
--- 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 bf6898faa8..4b48bab676 100755
--- 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 0943da29b6..7d20ef5202 100755
--- 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)