summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-01-06 12:40:07 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-01-06 15:21:21 +0100
commit4236ec9d6d128467b7f9e5306ed94b2bd025f9ad (patch)
tree076b02c49493e55cd931126e65f7128a02d8daee
parent24d5a7202ab521b92eb07c93647ae2d381e181a5 (diff)
downloadsamba-4236ec9d6d128467b7f9e5306ed94b2bd025f9ad.tar.gz
samba-4236ec9d6d128467b7f9e5306ed94b2bd025f9ad.tar.bz2
samba-4236ec9d6d128467b7f9e5306ed94b2bd025f9ad.zip
Remove unused imports.
-rwxr-xr-xsource4/dsdb/tests/python/acl.py7
-rw-r--r--source4/dsdb/tests/python/ldap_syntaxes.py7
-rwxr-xr-xsource4/dsdb/tests/python/passwords.py2
-rwxr-xr-xsource4/dsdb/tests/python/sam.py1
-rwxr-xr-xsource4/dsdb/tests/python/sec_descriptor.py2
-rwxr-xr-xsource4/dsdb/tests/python/urgent_replication.py2
6 files changed, 7 insertions, 14 deletions
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 977221fe11..7e7d8d42bc 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -19,12 +19,11 @@ from ldb import (
from ldb import ERR_CONSTRAINT_VIOLATION
from ldb import ERR_OPERATIONS_ERROR
from ldb import Message, MessageElement, Dn
-from ldb import FLAG_MOD_REPLACE, FLAG_MOD_ADD, FLAG_MOD_DELETE
-from samba.ndr import ndr_pack, ndr_unpack
-from samba.dcerpc import security, drsuapi, misc, netlogon, nbt
+from ldb import FLAG_MOD_REPLACE, FLAG_MOD_ADD
+from samba.dcerpc import security, drsuapi, misc
from samba.auth import system_session
-from samba import gensec, sd_utils, join
+from samba import gensec, sd_utils
from samba.samdb import SamDB
from samba.credentials import Credentials
import samba.tests
diff --git a/source4/dsdb/tests/python/ldap_syntaxes.py b/source4/dsdb/tests/python/ldap_syntaxes.py
index 63296c8616..04b95d7a8a 100644
--- a/source4/dsdb/tests/python/ldap_syntaxes.py
+++ b/source4/dsdb/tests/python/ldap_syntaxes.py
@@ -6,7 +6,6 @@ import optparse
import sys
import time
import random
-import os
import uuid
sys.path.append("bin/python")
@@ -17,15 +16,11 @@ samba.ensure_external_module("subunit", "subunit/python")
import samba.getopt as options
from samba.auth import system_session
-from ldb import SCOPE_ONELEVEL, SCOPE_BASE, SCOPE_SUBTREE, LdbError
-from ldb import ERR_NO_SUCH_OBJECT
+from ldb import SCOPE_BASE, SCOPE_SUBTREE, LdbError
from ldb import ERR_CONSTRAINT_VIOLATION
from ldb import ERR_INVALID_ATTRIBUTE_SYNTAX
from ldb import ERR_ENTRY_ALREADY_EXISTS
-from samba.ndr import ndr_pack, ndr_unpack
-from samba.dcerpc import security
-
from subunit.run import SubunitTestRunner
import unittest
diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py
index 28a0776524..70bca933f6 100755
--- a/source4/dsdb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
@@ -24,7 +24,7 @@ import samba.getopt as options
from samba.auth import system_session
from samba.credentials import Credentials
from ldb import SCOPE_BASE, LdbError
-from ldb import ERR_NO_SUCH_OBJECT, ERR_ATTRIBUTE_OR_VALUE_EXISTS
+from ldb import ERR_ATTRIBUTE_OR_VALUE_EXISTS
from ldb import ERR_UNWILLING_TO_PERFORM, ERR_INSUFFICIENT_ACCESS_RIGHTS
from ldb import ERR_NO_SUCH_ATTRIBUTE
from ldb import ERR_CONSTRAINT_VIOLATION
diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index 4242fd6c63..03d698408b 100755
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -42,7 +42,6 @@ from samba.dcerpc.security import (DOMAIN_RID_USERS, DOMAIN_RID_DOMAIN_MEMBERS,
from subunit.run import SubunitTestRunner
import unittest
-from samba.ndr import ndr_unpack
from samba.dcerpc import security
from samba.tests import delete_force
diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index c24b6e9898..c08035b204 100755
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -19,7 +19,7 @@ import samba.getopt as options
from ldb import SCOPE_SUBTREE, SCOPE_BASE, LdbError, ERR_NO_SUCH_OBJECT
# For running the test unit
-from samba.ndr import ndr_pack, ndr_unpack
+from samba.ndr import ndr_pack
from samba.dcerpc import security
from samba import gensec, sd_utils
diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index 946d7d7f34..f35dc6dfdb 100755
--- a/source4/dsdb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
@@ -13,7 +13,7 @@ samba.ensure_external_module("subunit", "subunit/python")
import samba.getopt as options
from samba.auth import system_session
-from ldb import (SCOPE_BASE, LdbError, ERR_NO_SUCH_OBJECT, Message,
+from ldb import (LdbError, ERR_NO_SUCH_OBJECT, Message,
MessageElement, Dn, FLAG_MOD_REPLACE)
from samba.samdb import SamDB
import samba.tests