Move python modules from source4/scripting/python/ to python/.

Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sat Mar  2 03:57:34 CET 2013 on sn-devel-104

120 files changed, 8 insertions, 8 deletions

diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 0bba2ec7a76..8074fb6efdb 100644
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -20,7 +20,7 @@
 #include <Python.h>
 #include "includes.h"
 #include "libcli/util/pyerrors.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include "../libcli/nbt/libnbt.h"
 #include "lib/events/events.h"
 
diff --git a/source4/scripting/python/examples/dnsserver.py b/python/examples/dnsserver.py
index c65b1c40998..c65b1c40998 100755
--- a/source4/scripting/python/examples/dnsserver.py
+++ b/python/examples/dnsserver.py
diff --git a/source4/scripting/python/examples/netbios.py b/python/examples/netbios.py
index a29b09f0517..a29b09f0517 100644
--- a/source4/scripting/python/examples/netbios.py
+++ b/python/examples/netbios.py
diff --git a/source4/scripting/python/examples/samr.py b/python/examples/samr.py
index 9b8e31e434b..9b8e31e434b 100755
--- a/source4/scripting/python/examples/samr.py
+++ b/python/examples/samr.py
diff --git a/source4/scripting/python/examples/winreg.py b/python/examples/winreg.py
index 484a69b8424..484a69b8424 100755
--- a/source4/scripting/python/examples/winreg.py
+++ b/python/examples/winreg.py
diff --git a/source4/scripting/python/modules.c b/python/modules.c
index 78cdbc0d879..371f0d5a07a 100644
--- a/source4/scripting/python/modules.c
+++ b/python/modules.c
@@ -19,7 +19,7 @@
 
 #include <Python.h>
 #include "includes.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include "dynconfig/dynconfig.h"
 
 static bool PySys_PathPrepend(PyObject *list, const char *path)
diff --git a/source4/scripting/python/modules.h b/python/modules.h
index e7e97aa1bf4..e7e97aa1bf4 100644
--- a/source4/scripting/python/modules.h
+++ b/python/modules.h
diff --git a/source4/scripting/python/pyglue.c b/python/pyglue.c
index 735f03a1e16..735f03a1e16 100644
--- a/source4/scripting/python/pyglue.c
+++ b/python/pyglue.c
diff --git a/source4/scripting/python/samba/__init__.py b/python/samba/__init__.py
index cd2a309fc0a..cd2a309fc0a 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/python/samba/__init__.py
diff --git a/source4/scripting/python/samba/common.py b/python/samba/common.py
index e47f276f819..e47f276f819 100644
--- a/source4/scripting/python/samba/common.py
+++ b/python/samba/common.py
diff --git a/source4/scripting/python/samba/dbchecker.py b/python/samba/dbchecker.py
index 06fd82752f7..06fd82752f7 100644
--- a/source4/scripting/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
diff --git a/source4/scripting/python/samba/drs_utils.py b/python/samba/drs_utils.py
index 6e2cfea9ab2..6e2cfea9ab2 100644
--- a/source4/scripting/python/samba/drs_utils.py
+++ b/python/samba/drs_utils.py
diff --git a/source4/scripting/python/samba/getopt.py b/python/samba/getopt.py
index c3c080084ec..c3c080084ec 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/python/samba/getopt.py
diff --git a/source4/scripting/python/samba/hostconfig.py b/python/samba/hostconfig.py
index a66fbc23130..a66fbc23130 100644
--- a/source4/scripting/python/samba/hostconfig.py
+++ b/python/samba/hostconfig.py
diff --git a/source4/scripting/python/samba/idmap.py b/python/samba/idmap.py
index 0cb729fbc29..0cb729fbc29 100644
--- a/source4/scripting/python/samba/idmap.py
+++ b/python/samba/idmap.py
diff --git a/source4/scripting/python/samba/join.py b/python/samba/join.py
index c55c22cad53..c55c22cad53 100644
--- a/source4/scripting/python/samba/join.py
+++ b/python/samba/join.py
diff --git a/source4/scripting/python/samba/kcc_utils.py b/python/samba/kcc_utils.py
index 57c31876a69..57c31876a69 100644
--- a/source4/scripting/python/samba/kcc_utils.py
+++ b/python/samba/kcc_utils.py
diff --git a/source4/scripting/python/samba/ms_display_specifiers.py b/python/samba/ms_display_specifiers.py
index 44dfba07b39..44dfba07b39 100644
--- a/source4/scripting/python/samba/ms_display_specifiers.py
+++ b/python/samba/ms_display_specifiers.py
diff --git a/source4/scripting/python/samba/ms_schema.py b/python/samba/ms_schema.py
index c16693c9b5a..c16693c9b5a 100644
--- a/source4/scripting/python/samba/ms_schema.py
+++ b/python/samba/ms_schema.py
diff --git a/source4/scripting/python/samba/ndr.py b/python/samba/ndr.py
index 39e4a482efb..39e4a482efb 100644
--- a/source4/scripting/python/samba/ndr.py
+++ b/python/samba/ndr.py
diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/python/samba/netcmd/__init__.py
index a3edf505165..a3edf505165 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/python/samba/netcmd/__init__.py
diff --git a/source4/scripting/python/samba/netcmd/common.py b/python/samba/netcmd/common.py
index 5c0bd95f089..5c0bd95f089 100644
--- a/source4/scripting/python/samba/netcmd/common.py
+++ b/python/samba/netcmd/common.py
diff --git a/source4/scripting/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py
index 889b0ff075c..889b0ff075c 100644
--- a/source4/scripting/python/samba/netcmd/dbcheck.py
+++ b/python/samba/netcmd/dbcheck.py
diff --git a/source4/scripting/python/samba/netcmd/delegation.py b/python/samba/netcmd/delegation.py
index 47dffb07d51..47dffb07d51 100644
--- a/source4/scripting/python/samba/netcmd/delegation.py
+++ b/python/samba/netcmd/delegation.py
diff --git a/source4/scripting/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
index c00d17ad727..c00d17ad727 100644
--- a/source4/scripting/python/samba/netcmd/dns.py
+++ b/python/samba/netcmd/dns.py
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 4ba305c2713..4ba305c2713 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
diff --git a/source4/scripting/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py
index ff8d8304ebf..ff8d8304ebf 100644
--- a/source4/scripting/python/samba/netcmd/drs.py
+++ b/python/samba/netcmd/drs.py
diff --git a/source4/scripting/python/samba/netcmd/dsacl.py b/python/samba/netcmd/dsacl.py
index 28aa843adbc..28aa843adbc 100644
--- a/source4/scripting/python/samba/netcmd/dsacl.py
+++ b/python/samba/netcmd/dsacl.py
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py
index c938c915fa9..c938c915fa9 100644
--- a/source4/scripting/python/samba/netcmd/fsmo.py
+++ b/python/samba/netcmd/fsmo.py
diff --git a/source4/scripting/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index 23b562eb635..23b562eb635 100644
--- a/source4/scripting/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
diff --git a/source4/scripting/python/samba/netcmd/group.py b/python/samba/netcmd/group.py
index 731d4c1564c..731d4c1564c 100644
--- a/source4/scripting/python/samba/netcmd/group.py
+++ b/python/samba/netcmd/group.py
diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py
index 8398205e4ba..8398205e4ba 100644
--- a/source4/scripting/python/samba/netcmd/ldapcmp.py
+++ b/python/samba/netcmd/ldapcmp.py
diff --git a/source4/scripting/python/samba/netcmd/main.py b/python/samba/netcmd/main.py
index 5f788235880..5f788235880 100644
--- a/source4/scripting/python/samba/netcmd/main.py
+++ b/python/samba/netcmd/main.py
diff --git a/source4/scripting/python/samba/netcmd/ntacl.py b/python/samba/netcmd/ntacl.py
index 6d4d350653e..6d4d350653e 100644
--- a/source4/scripting/python/samba/netcmd/ntacl.py
+++ b/python/samba/netcmd/ntacl.py
diff --git a/source4/scripting/python/samba/netcmd/processes.py b/python/samba/netcmd/processes.py
index b25a2e453ec..b25a2e453ec 100644
--- a/source4/scripting/python/samba/netcmd/processes.py
+++ b/python/samba/netcmd/processes.py
diff --git a/source4/scripting/python/samba/netcmd/rodc.py b/python/samba/netcmd/rodc.py
index 2dc6112a302..2dc6112a302 100644
--- a/source4/scripting/python/samba/netcmd/rodc.py
+++ b/python/samba/netcmd/rodc.py
diff --git a/source4/scripting/python/samba/netcmd/sites.py b/python/samba/netcmd/sites.py
index 09df55ec9c5..09df55ec9c5 100644
--- a/source4/scripting/python/samba/netcmd/sites.py
+++ b/python/samba/netcmd/sites.py
diff --git a/source4/scripting/python/samba/netcmd/spn.py b/python/samba/netcmd/spn.py
index 03d072ec9b6..03d072ec9b6 100644
--- a/source4/scripting/python/samba/netcmd/spn.py
+++ b/python/samba/netcmd/spn.py
diff --git a/source4/scripting/python/samba/netcmd/testparm.py b/python/samba/netcmd/testparm.py
index 92514694218..92514694218 100644
--- a/source4/scripting/python/samba/netcmd/testparm.py
+++ b/python/samba/netcmd/testparm.py
diff --git a/source4/scripting/python/samba/netcmd/time.py b/python/samba/netcmd/time.py
index 694b6adda9b..694b6adda9b 100644
--- a/source4/scripting/python/samba/netcmd/time.py
+++ b/python/samba/netcmd/time.py
diff --git a/source4/scripting/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index b98ec344b2a..b98ec344b2a 100644
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
diff --git a/source4/scripting/python/samba/netcmd/vampire.py b/python/samba/netcmd/vampire.py
index b12222e79e6..b12222e79e6 100644
--- a/source4/scripting/python/samba/netcmd/vampire.py
+++ b/python/samba/netcmd/vampire.py
diff --git a/source4/scripting/python/samba/ntacls.py b/python/samba/ntacls.py
index 53438d84bff..53438d84bff 100644
--- a/source4/scripting/python/samba/ntacls.py
+++ b/python/samba/ntacls.py
diff --git a/source4/scripting/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index aac0ee36b2a..aac0ee36b2a 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
diff --git a/source4/scripting/python/samba/provision/backend.py b/python/samba/provision/backend.py
index f88b0db89c5..f88b0db89c5 100644
--- a/source4/scripting/python/samba/provision/backend.py
+++ b/python/samba/provision/backend.py
diff --git a/source4/scripting/python/samba/provision/common.py b/python/samba/provision/common.py
index f96704bccee..f96704bccee 100644
--- a/source4/scripting/python/samba/provision/common.py
+++ b/python/samba/provision/common.py
diff --git a/source4/scripting/python/samba/provision/descriptor.py b/python/samba/provision/descriptor.py
index 32e91ed2b57..32e91ed2b57 100644
--- a/source4/scripting/python/samba/provision/descriptor.py
+++ b/python/samba/provision/descriptor.py
diff --git a/source4/scripting/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 4522683fe8b..4522683fe8b 100644
--- a/source4/scripting/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
diff --git a/source4/scripting/python/samba/samba3/__init__.py b/python/samba/samba3/__init__.py
index acccff4e296..acccff4e296 100644
--- a/source4/scripting/python/samba/samba3/__init__.py
+++ b/python/samba/samba3/__init__.py
diff --git a/source4/scripting/python/samba/samdb.py b/python/samba/samdb.py
index 2dfc839519e..2dfc839519e 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/python/samba/samdb.py
diff --git a/source4/scripting/python/samba/schema.py b/python/samba/schema.py
index 5c8f506f26e..5c8f506f26e 100644
--- a/source4/scripting/python/samba/schema.py
+++ b/python/samba/schema.py
diff --git a/source4/scripting/python/samba/sd_utils.py b/python/samba/sd_utils.py
index ded9bfc1926..ded9bfc1926 100644
--- a/source4/scripting/python/samba/sd_utils.py
+++ b/python/samba/sd_utils.py
diff --git a/source4/scripting/python/samba/sites.py b/python/samba/sites.py
index 76c57dd11cf..76c57dd11cf 100644
--- a/source4/scripting/python/samba/sites.py
+++ b/python/samba/sites.py
diff --git a/source4/scripting/python/samba/tdb_util.py b/python/samba/tdb_util.py
index d967434e5b8..d967434e5b8 100644
--- a/source4/scripting/python/samba/tdb_util.py
+++ b/python/samba/tdb_util.py
diff --git a/source4/scripting/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 2df30a641bf..2df30a641bf 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
diff --git a/source4/scripting/python/samba/tests/auth.py b/python/samba/tests/auth.py
index f71e1a784d2..f71e1a784d2 100644
--- a/source4/scripting/python/samba/tests/auth.py
+++ b/python/samba/tests/auth.py
diff --git a/source4/scripting/python/samba/tests/blackbox/__init__.py b/python/samba/tests/blackbox/__init__.py
index 361e5cfe5e5..361e5cfe5e5 100644
--- a/source4/scripting/python/samba/tests/blackbox/__init__.py
+++ b/python/samba/tests/blackbox/__init__.py
diff --git a/source4/scripting/python/samba/tests/blackbox/ndrdump.py b/python/samba/tests/blackbox/ndrdump.py
index fca9a931533..fca9a931533 100644
--- a/source4/scripting/python/samba/tests/blackbox/ndrdump.py
+++ b/python/samba/tests/blackbox/ndrdump.py
diff --git a/source4/scripting/python/samba/tests/blackbox/samba_tool_drs.py b/python/samba/tests/blackbox/samba_tool_drs.py
index 62d7bf123bb..62d7bf123bb 100644
--- a/source4/scripting/python/samba/tests/blackbox/samba_tool_drs.py
+++ b/python/samba/tests/blackbox/samba_tool_drs.py
diff --git a/source4/scripting/python/samba/tests/common.py b/python/samba/tests/common.py
index 8794e9dc8b3..8794e9dc8b3 100644
--- a/source4/scripting/python/samba/tests/common.py
+++ b/python/samba/tests/common.py
diff --git a/source4/scripting/python/samba/tests/core.py b/python/samba/tests/core.py
index 8206e68d4fb..8206e68d4fb 100644
--- a/source4/scripting/python/samba/tests/core.py
+++ b/python/samba/tests/core.py
diff --git a/source4/scripting/python/samba/tests/credentials.py b/python/samba/tests/credentials.py
index 95ee0fa0deb..95ee0fa0deb 100644
--- a/source4/scripting/python/samba/tests/credentials.py
+++ b/python/samba/tests/credentials.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/__init__.py b/python/samba/tests/dcerpc/__init__.py
index d84cb57a096..d84cb57a096 100644
--- a/source4/scripting/python/samba/tests/dcerpc/__init__.py
+++ b/python/samba/tests/dcerpc/__init__.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/python/samba/tests/dcerpc/bare.py
index 3efbf9d4cf3..3efbf9d4cf3 100644
--- a/source4/scripting/python/samba/tests/dcerpc/bare.py
+++ b/python/samba/tests/dcerpc/bare.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py
index 59d6eee7618..59d6eee7618 100644
--- a/source4/scripting/python/samba/tests/dcerpc/dnsserver.py
+++ b/python/samba/tests/dcerpc/dnsserver.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/misc.py b/python/samba/tests/dcerpc/misc.py
index 11e14aadfa7..11e14aadfa7 100644
--- a/source4/scripting/python/samba/tests/dcerpc/misc.py
+++ b/python/samba/tests/dcerpc/misc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/python/samba/tests/dcerpc/registry.py
index c7bcbfd530a..c7bcbfd530a 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/python/samba/tests/dcerpc/registry.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpc_talloc.py b/python/samba/tests/dcerpc/rpc_talloc.py
index c091f26c1b9..c091f26c1b9 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpc_talloc.py
+++ b/python/samba/tests/dcerpc/rpc_talloc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/python/samba/tests/dcerpc/rpcecho.py
index 099f8f619ce..099f8f619ce 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/python/samba/tests/dcerpc/rpcecho.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/python/samba/tests/dcerpc/sam.py
index 0e09323adbe..0e09323adbe 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/python/samba/tests/dcerpc/sam.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/srvsvc.py b/python/samba/tests/dcerpc/srvsvc.py
index 3206a27e678..3206a27e678 100644
--- a/source4/scripting/python/samba/tests/dcerpc/srvsvc.py
+++ b/python/samba/tests/dcerpc/srvsvc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/testrpc.py b/python/samba/tests/dcerpc/testrpc.py
index e35d6b55446..e35d6b55446 100644
--- a/source4/scripting/python/samba/tests/dcerpc/testrpc.py
+++ b/python/samba/tests/dcerpc/testrpc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/python/samba/tests/dcerpc/unix.py
index e8ef4da8630..e8ef4da8630 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/python/samba/tests/dcerpc/unix.py
diff --git a/source4/scripting/python/samba/tests/dns.py b/python/samba/tests/dns.py
index 49d699edb78..49d699edb78 100644
--- a/source4/scripting/python/samba/tests/dns.py
+++ b/python/samba/tests/dns.py
diff --git a/source4/scripting/python/samba/tests/docs.py b/python/samba/tests/docs.py
index c1b371680d7..c1b371680d7 100644
--- a/source4/scripting/python/samba/tests/docs.py
+++ b/python/samba/tests/docs.py
diff --git a/source4/scripting/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
index 3aef1d2fa48..3aef1d2fa48 100644
--- a/source4/scripting/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb.py
diff --git a/source4/scripting/python/samba/tests/gensec.py b/python/samba/tests/gensec.py
index e270c418ea6..e270c418ea6 100644
--- a/source4/scripting/python/samba/tests/gensec.py
+++ b/python/samba/tests/gensec.py
diff --git a/source4/scripting/python/samba/tests/getopt.py b/python/samba/tests/getopt.py
index 14ee0a7428b..14ee0a7428b 100644
--- a/source4/scripting/python/samba/tests/getopt.py
+++ b/python/samba/tests/getopt.py
diff --git a/source4/scripting/python/samba/tests/hostconfig.py b/python/samba/tests/hostconfig.py
index 526dc0fe4e3..526dc0fe4e3 100644
--- a/source4/scripting/python/samba/tests/hostconfig.py
+++ b/python/samba/tests/hostconfig.py
diff --git a/source4/scripting/python/samba/tests/libsmb_samba_internal.py b/python/samba/tests/libsmb_samba_internal.py
index fe9f197a2c2..fe9f197a2c2 100644
--- a/source4/scripting/python/samba/tests/libsmb_samba_internal.py
+++ b/python/samba/tests/libsmb_samba_internal.py
diff --git a/source4/scripting/python/samba/tests/messaging.py b/python/samba/tests/messaging.py
index f0cd368195f..f0cd368195f 100644
--- a/source4/scripting/python/samba/tests/messaging.py
+++ b/python/samba/tests/messaging.py
diff --git a/source4/scripting/python/samba/tests/netcmd.py b/python/samba/tests/netcmd.py
index 2cbac4e8bff..2cbac4e8bff 100644
--- a/source4/scripting/python/samba/tests/netcmd.py
+++ b/python/samba/tests/netcmd.py
diff --git a/source4/scripting/python/samba/tests/ntacls.py b/python/samba/tests/ntacls.py
index aa9ef6852ba..aa9ef6852ba 100644
--- a/source4/scripting/python/samba/tests/ntacls.py
+++ b/python/samba/tests/ntacls.py
diff --git a/source4/scripting/python/samba/tests/param.py b/python/samba/tests/param.py
index f539eba140d..f539eba140d 100644
--- a/source4/scripting/python/samba/tests/param.py
+++ b/python/samba/tests/param.py
diff --git a/source4/scripting/python/samba/tests/policy.py b/python/samba/tests/policy.py
index b2457451528..b2457451528 100644
--- a/source4/scripting/python/samba/tests/policy.py
+++ b/python/samba/tests/policy.py
diff --git a/source4/scripting/python/samba/tests/posixacl.py b/python/samba/tests/posixacl.py
index 7cd22ebccd1..7cd22ebccd1 100644
--- a/source4/scripting/python/samba/tests/posixacl.py
+++ b/python/samba/tests/posixacl.py
diff --git a/source4/scripting/python/samba/tests/provision.py b/python/samba/tests/provision.py
index 929e7074f75..929e7074f75 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/python/samba/tests/provision.py
diff --git a/source4/scripting/python/samba/tests/registry.py b/python/samba/tests/registry.py
index 8016a0bb686..8016a0bb686 100644
--- a/source4/scripting/python/samba/tests/registry.py
+++ b/python/samba/tests/registry.py
diff --git a/source4/scripting/python/samba/tests/samba3.py b/python/samba/tests/samba3.py
index 0a7f13c66fa..0a7f13c66fa 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/python/samba/tests/samba3.py
diff --git a/source4/scripting/python/samba/tests/samba3sam.py b/python/samba/tests/samba3sam.py
index 9c017fb79c3..9c017fb79c3 100644
--- a/source4/scripting/python/samba/tests/samba3sam.py
+++ b/python/samba/tests/samba3sam.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/__init__.py b/python/samba/tests/samba_tool/__init__.py
index 3d7f0591e25..3d7f0591e25 100644
--- a/source4/scripting/python/samba/tests/samba_tool/__init__.py
+++ b/python/samba/tests/samba_tool/__init__.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py
index 60ccaa543d7..60ccaa543d7 100644
--- a/source4/scripting/python/samba/tests/samba_tool/base.py
+++ b/python/samba/tests/samba_tool/base.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py
index e20a97794ae..e20a97794ae 100644
--- a/source4/scripting/python/samba/tests/samba_tool/gpo.py
+++ b/python/samba/tests/samba_tool/gpo.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/group.py b/python/samba/tests/samba_tool/group.py
index 2c0c46e5dc8..2c0c46e5dc8 100644
--- a/source4/scripting/python/samba/tests/samba_tool/group.py
+++ b/python/samba/tests/samba_tool/group.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/ntacl.py b/python/samba/tests/samba_tool/ntacl.py
index 2a329fe7d40..2a329fe7d40 100644
--- a/source4/scripting/python/samba/tests/samba_tool/ntacl.py
+++ b/python/samba/tests/samba_tool/ntacl.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/processes.py b/python/samba/tests/samba_tool/processes.py
index 91a5266b54a..91a5266b54a 100644
--- a/source4/scripting/python/samba/tests/samba_tool/processes.py
+++ b/python/samba/tests/samba_tool/processes.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/timecmd.py b/python/samba/tests/samba_tool/timecmd.py
index 000f0f28282..000f0f28282 100644
--- a/source4/scripting/python/samba/tests/samba_tool/timecmd.py
+++ b/python/samba/tests/samba_tool/timecmd.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py
index 33344cd3d31..33344cd3d31 100644
--- a/source4/scripting/python/samba/tests/samba_tool/user.py
+++ b/python/samba/tests/samba_tool/user.py
diff --git a/source4/scripting/python/samba/tests/samdb.py b/python/samba/tests/samdb.py
index 5c80391cbae..5c80391cbae 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/python/samba/tests/samdb.py
diff --git a/source4/scripting/python/samba/tests/security.py b/python/samba/tests/security.py
index d2938aacb02..d2938aacb02 100644
--- a/source4/scripting/python/samba/tests/security.py
+++ b/python/samba/tests/security.py
diff --git a/source4/scripting/python/samba/tests/source.py b/python/samba/tests/source.py
index 2612ae68cf5..2612ae68cf5 100644
--- a/source4/scripting/python/samba/tests/source.py
+++ b/python/samba/tests/source.py
diff --git a/source4/scripting/python/samba/tests/strings.py b/python/samba/tests/strings.py
index 23382d756ec..23382d756ec 100644
--- a/source4/scripting/python/samba/tests/strings.py
+++ b/python/samba/tests/strings.py
diff --git a/source4/scripting/python/samba/tests/unicodenames.py b/python/samba/tests/unicodenames.py
index ed65de6651f..ed65de6651f 100644
--- a/source4/scripting/python/samba/tests/unicodenames.py
+++ b/python/samba/tests/unicodenames.py
diff --git a/source4/scripting/python/samba/tests/upgrade.py b/python/samba/tests/upgrade.py
index b46a4173191..b46a4173191 100644
--- a/source4/scripting/python/samba/tests/upgrade.py
+++ b/python/samba/tests/upgrade.py
diff --git a/source4/scripting/python/samba/tests/upgradeprovision.py b/python/samba/tests/upgradeprovision.py
index 93a6731c830..93a6731c830 100644
--- a/source4/scripting/python/samba/tests/upgradeprovision.py
+++ b/python/samba/tests/upgradeprovision.py
diff --git a/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py b/python/samba/tests/upgradeprovisionneeddc.py
index a7cb298ed7f..a7cb298ed7f 100644
--- a/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py
+++ b/python/samba/tests/upgradeprovisionneeddc.py
diff --git a/source4/scripting/python/samba/tests/xattr.py b/python/samba/tests/xattr.py
index 89add284566..89add284566 100644
--- a/source4/scripting/python/samba/tests/xattr.py
+++ b/python/samba/tests/xattr.py
diff --git a/source4/scripting/python/samba/upgrade.py b/python/samba/upgrade.py
index d680a7ca235..d680a7ca235 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
diff --git a/source4/scripting/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py
index 1ec19d4ab61..1ec19d4ab61 100644
--- a/source4/scripting/python/samba/upgradehelpers.py
+++ b/python/samba/upgradehelpers.py
diff --git a/source4/scripting/python/samba/web_server/__init__.py b/python/samba/web_server/__init__.py
index 78ce953c612..78ce953c612 100644
--- a/source4/scripting/python/samba/web_server/__init__.py
+++ b/python/samba/web_server/__init__.py
diff --git a/source4/scripting/python/samba/xattr.py b/python/samba/xattr.py
index 8516ba99cae..8516ba99cae 100644
--- a/source4/scripting/python/samba/xattr.py
+++ b/python/samba/xattr.py
diff --git a/source4/scripting/python/samba_external/README b/python/samba_external/README
index d6a4dec7b1b..d6a4dec7b1b 100644
--- a/source4/scripting/python/samba_external/README
+++ b/python/samba_external/README
diff --git a/source4/scripting/python/uuidmodule.c b/python/uuidmodule.c
index 3bfe0162cac..3bfe0162cac 100644
--- a/source4/scripting/python/uuidmodule.c
+++ b/python/uuidmodule.c
diff --git a/source4/scripting/python/wscript_build b/python/wscript_build
index a40b5834f94..a40b5834f94 100644
--- a/source4/scripting/python/wscript_build
+++ b/python/wscript_build
diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index a84fbf8e718..02e5ae28cec 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -22,7 +22,7 @@
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/pycredentials.h"
 #include "libcli/util/pyerrors.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include <pytalloc.h>
 #include <tevent.h>
 #include "librpc/rpc/pyrpc_util.h"
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 3901d4d599c..d035fb024a7 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -21,7 +21,7 @@
 
 #include <Python.h>
 #include "includes.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include "libcli/util/pyerrors.h"
 #include "librpc/rpc/pyrpc_util.h"
 #include "librpc/ndr/libndr.h"
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 298e1c3bfa5..cdd28d8542c 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -26,7 +26,7 @@
 #include "param/provision.h"
 #include "param/secrets.h"
 #include <pytalloc.h>
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include "param/pyparam.h"
 #include "dynconfig/dynconfig.h"
 
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 15a78bf499b..918195e8429 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -49,7 +49,7 @@ import samba.tests
 usage = 'subunitrun [options] <tests>'
 description = '''
 This runs a Samba python test suite. The tests are typically located in
-source4/scripting/python/samba/tests/*.py
+python/samba/tests/*.py
 
 To run the tests from one of those modules, specify the test as
 samba.tests.MODULE. For example, to run the tests in common.py:
diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c
index 17ad65afe41..f0e7bd59b85 100644
--- a/source4/web_server/wsgi.c
+++ b/source4/web_server/wsgi.c
@@ -26,7 +26,7 @@
 #include "../lib/util/dlinklist.h"
 #include "lib/tls/tls.h"
 #include "lib/tsocket/tsocket.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 
 /* There's no Py_ssize_t in 2.4, apparently */
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5
diff --git a/wscript_build b/wscript_build
index ec673cee137..f0c9f2a5b3d 100644
--- a/wscript_build
+++ b/wscript_build
@@ -40,7 +40,7 @@ bld.RECURSE('lib/ldb')
 bld.RECURSE('lib/param')
 bld.RECURSE('dynconfig')
 bld.RECURSE('lib/util/charset')
-bld.RECURSE('source4/scripting/python')
+bld.RECURSE('python')
 bld.RECURSE('source4/param')
 bld.RECURSE('source4/librpc')
 bld.RECURSE('source4/dsdb')