diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-22 00:56:36 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-22 00:56:36 +0200 |
| commit | 059c012656e6369f417c11f9984ddb1925782394 (patch) | |
| tree | a50d3f73dd0e39595672fe2ee7a0c65337297a3e /source4/scripting | |
| parent | 49706ab19bd3ffd6125639e6a7753b2350cf54e1 (diff) | |
| download | samba-059c012656e6369f417c11f9984ddb1925782394.tar.gz samba-059c012656e6369f417c11f9984ddb1925782394.tar.bz2 samba-059c012656e6369f417c11f9984ddb1925782394.zip | |
Fix dependencies and imports.
(This used to be commit 37ef86f8de9039b8226b190254d842e92b5faad7)
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/config.mk | 4 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/dcerpc/registry.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/dcerpc/sam.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk index 37e346a73a..ddbc5674f2 100644 --- a/source4/scripting/python/config.mk +++ b/source4/scripting/python/config.mk @@ -6,7 +6,7 @@ INIT_FUNCTION_SENTINEL = { NULL, NULL } LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, modules.o) [SUBSYSTEM::PYTALLOC] -PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON +PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON LIBTALLOC PYTALLOC_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, pytalloc.o) @@ -30,6 +30,6 @@ $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubs $(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py)) epydoc:: pythonmods - PYTHONPATH=$(pythonbuilddir) epydoc samba dcerpc + PYTHONPATH=$(pythonbuilddir) epydoc --no-private samba dcerpc tdb ldb subunit install:: installpython diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py index 1afdc582a7..0a1b5ecd10 100644 --- a/source4/scripting/python/samba/tests/dcerpc/registry.py +++ b/source4/scripting/python/samba/tests/dcerpc/registry.py @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -import winreg +from dcerpc import winreg import unittest from samba.tests import RpcInterfaceTestCase diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py index 8ef12dad86..50871114c0 100644 --- a/source4/scripting/python/samba/tests/dcerpc/sam.py +++ b/source4/scripting/python/samba/tests/dcerpc/sam.py @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -import samr +from dcerpc import samr from samba.tests import RpcInterfaceTestCase class SamrTests(RpcInterfaceTestCase): |