summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-04-08 21:01:17 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-04-08 23:20:36 +0200
commitdd4ef4e106d372cfadf7b47db8bf9dc25728b3bc (patch)
treeb8c6633312ee59748fe11e665516c63969e15680 /source4/lib
parenta35d876537eb301d75a254d9da97268d041da8d6 (diff)
downloadsamba-dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc.tar.gz
samba-dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc.tar.bz2
samba-dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc.zip
s4-python: More cleanups.
Diffstat (limited to 'source4/lib')
-rwxr-xr-xsource4/lib/ldb/tests/python/acl.py6
-rwxr-xr-xsource4/lib/ldb/tests/python/deletetest.py5
2 files changed, 5 insertions, 6 deletions
diff --git a/source4/lib/ldb/tests/python/acl.py b/source4/lib/ldb/tests/python/acl.py
index 4f320ee668..37265ef3d5 100755
--- a/source4/lib/ldb/tests/python/acl.py
+++ b/source4/lib/ldb/tests/python/acl.py
@@ -2,7 +2,6 @@
# -*- coding: utf-8 -*-
# This is unit with tests for LDAP access checks
-import getopt
import optparse
import sys
import os
@@ -13,9 +12,8 @@ sys.path.append("bin/python")
import samba.getopt as options
-from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
-from ldb import ERR_NO_SUCH_OBJECT, ERR_INVALID_DN_SYNTAX, ERR_UNWILLING_TO_PERFORM
-from ldb import ERR_INSUFFICIENT_ACCESS_RIGHTS
+from ldb import (
+ SCOPE_BASE, LdbError, ERR_NO_SUCH_OBJECT, ERR_INSUFFICIENT_ACCESS_RIGHTS)
from samba.ndr import ndr_pack, ndr_unpack
from samba.dcerpc import security
diff --git a/source4/lib/ldb/tests/python/deletetest.py b/source4/lib/ldb/tests/python/deletetest.py
index 55f34fac14..44eb919e09 100755
--- a/source4/lib/ldb/tests/python/deletetest.py
+++ b/source4/lib/ldb/tests/python/deletetest.py
@@ -6,8 +6,9 @@ import sys
import os
sys.path.append("bin/python")
-sys.path.append("../lib/subunit/python")
-sys.path.append("../lib/testtools")
+import samba
+samba.ensure_external_module("subunit", "subunit")
+samba.ensure_external_module("testtools", "testtools")
import samba.getopt as options