summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/scripting/python/pyglue.c2
-rw-r--r--source4/scripting/python/samba/__init__.py1
-rwxr-xr-xsource4/selftest/tests.sh2
3 files changed, 2 insertions, 3 deletions
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c
index ec15e77a93..1f968e16f9 100644
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -110,8 +110,6 @@ static PyObject *py_set_debug_level(PyObject *self, PyObject *args)
Py_RETURN_NONE;
}
-
-
/*
return the list of interface IPs we have configured
takes an loadparm context, returns a list of IPs in string form
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 72bbb4a7e3..fb71110600 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -52,6 +52,7 @@ class Ldb(_Ldb):
not necessarily the Sam database. For Sam-specific helper
functions see samdb.py.
"""
+
def __init__(self, url=None, lp=None, modules_dir=None, session_info=None,
credentials=None, flags=0, options=None):
"""Opens a Samba Ldb file.
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 719f4a65b1..596604b627 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -104,7 +104,7 @@ planpythontestsuite() {
env=$2
module="$3"
shift 3
- plantestsuite_idlist "$name" "$env" python -m subunit.run $module
+ plantestsuite_idlist "$name" "$env" PYTHONPATH=$samba4srcdir/../lib/subunit/python:$samba4srcdir/../lib/testtools $PYTHON -m subunit.run $module
}
plansmbtorturetestsuite() {