From: Jelmer Vernooij Date: Thu, 6 Jan 2011 11:40:07 +0000 (+0100) Subject: Remove unused imports. X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=4236ec9d6d128467b7f9e5306ed94b2bd025f9ad Remove unused imports. --- diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py index 977221fe119..7e7d8d42bcf 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 63296c86168..04b95d7a8a8 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 28a0776524a..70bca933f6e 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 4242fd6c63e..03d698408b5 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 c24b6e98982..c08035b204e 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 946d7d7f34e..f35dc6dfdb0 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