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

diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 0bba2ec7a760437373a2edfe2ef315079b947c0b..8074fb6efdb45e56c209b4d90ef21d8e2dded53b 100644 (file)
--- 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
similarity index 100%
rename from source4/scripting/python/examples/dnsserver.py
rename to python/examples/dnsserver.py

diff --git a/source4/scripting/python/examples/netbios.py b/python/examples/netbios.py
similarity index 100%
rename from source4/scripting/python/examples/netbios.py
rename to python/examples/netbios.py

diff --git a/source4/scripting/python/examples/samr.py b/python/examples/samr.py
similarity index 100%
rename from source4/scripting/python/examples/samr.py
rename to python/examples/samr.py

diff --git a/source4/scripting/python/examples/winreg.py b/python/examples/winreg.py
similarity index 100%
rename from source4/scripting/python/examples/winreg.py
rename to python/examples/winreg.py

diff --git a/source4/scripting/python/modules.c b/python/modules.c
similarity index 97%
rename from source4/scripting/python/modules.c
rename to python/modules.c
index 78cdbc0d87966dfe9fb5d0d2d4f574b4c2745a4e..371f0d5a07acb27121c1b1c851cea9f42bb90d02 100644 (file)
--- 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
similarity index 100%
rename from source4/scripting/python/modules.h
rename to python/modules.h

diff --git a/source4/scripting/python/pyglue.c b/python/pyglue.c
similarity index 100%
rename from source4/scripting/python/pyglue.c
rename to python/pyglue.c

diff --git a/source4/scripting/python/samba/__init__.py b/python/samba/__init__.py
similarity index 100%
rename from source4/scripting/python/samba/__init__.py
rename to python/samba/__init__.py

diff --git a/source4/scripting/python/samba/common.py b/python/samba/common.py
similarity index 100%
rename from source4/scripting/python/samba/common.py
rename to python/samba/common.py

diff --git a/source4/scripting/python/samba/dbchecker.py b/python/samba/dbchecker.py
similarity index 100%
rename from source4/scripting/python/samba/dbchecker.py
rename to python/samba/dbchecker.py

diff --git a/source4/scripting/python/samba/drs_utils.py b/python/samba/drs_utils.py
similarity index 100%
rename from source4/scripting/python/samba/drs_utils.py
rename to python/samba/drs_utils.py

diff --git a/source4/scripting/python/samba/getopt.py b/python/samba/getopt.py
similarity index 100%
rename from source4/scripting/python/samba/getopt.py
rename to python/samba/getopt.py

diff --git a/source4/scripting/python/samba/hostconfig.py b/python/samba/hostconfig.py
similarity index 100%
rename from source4/scripting/python/samba/hostconfig.py
rename to python/samba/hostconfig.py

diff --git a/source4/scripting/python/samba/idmap.py b/python/samba/idmap.py
similarity index 100%
rename from source4/scripting/python/samba/idmap.py
rename to python/samba/idmap.py

diff --git a/source4/scripting/python/samba/join.py b/python/samba/join.py
similarity index 100%
rename from source4/scripting/python/samba/join.py
rename to python/samba/join.py

diff --git a/source4/scripting/python/samba/kcc_utils.py b/python/samba/kcc_utils.py
similarity index 100%
rename from source4/scripting/python/samba/kcc_utils.py
rename to python/samba/kcc_utils.py

diff --git a/source4/scripting/python/samba/ms_display_specifiers.py b/python/samba/ms_display_specifiers.py
similarity index 100%
rename from source4/scripting/python/samba/ms_display_specifiers.py
rename to python/samba/ms_display_specifiers.py

diff --git a/source4/scripting/python/samba/ms_schema.py b/python/samba/ms_schema.py
similarity index 100%
rename from source4/scripting/python/samba/ms_schema.py
rename to python/samba/ms_schema.py

diff --git a/source4/scripting/python/samba/ndr.py b/python/samba/ndr.py
similarity index 100%
rename from source4/scripting/python/samba/ndr.py
rename to python/samba/ndr.py

diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/python/samba/netcmd/__init__.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/__init__.py
rename to python/samba/netcmd/__init__.py

diff --git a/source4/scripting/python/samba/netcmd/common.py b/python/samba/netcmd/common.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/common.py
rename to python/samba/netcmd/common.py

diff --git a/source4/scripting/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/dbcheck.py
rename to python/samba/netcmd/dbcheck.py

diff --git a/source4/scripting/python/samba/netcmd/delegation.py b/python/samba/netcmd/delegation.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/delegation.py
rename to python/samba/netcmd/delegation.py

diff --git a/source4/scripting/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/dns.py
rename to python/samba/netcmd/dns.py

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/domain.py
rename to python/samba/netcmd/domain.py

diff --git a/source4/scripting/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/drs.py
rename to python/samba/netcmd/drs.py

diff --git a/source4/scripting/python/samba/netcmd/dsacl.py b/python/samba/netcmd/dsacl.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/dsacl.py
rename to python/samba/netcmd/dsacl.py

diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/fsmo.py
rename to python/samba/netcmd/fsmo.py

diff --git a/source4/scripting/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/gpo.py
rename to python/samba/netcmd/gpo.py

diff --git a/source4/scripting/python/samba/netcmd/group.py b/python/samba/netcmd/group.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/group.py
rename to python/samba/netcmd/group.py

diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/ldapcmp.py
rename to python/samba/netcmd/ldapcmp.py

diff --git a/source4/scripting/python/samba/netcmd/main.py b/python/samba/netcmd/main.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/main.py
rename to python/samba/netcmd/main.py

diff --git a/source4/scripting/python/samba/netcmd/ntacl.py b/python/samba/netcmd/ntacl.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/ntacl.py
rename to python/samba/netcmd/ntacl.py

diff --git a/source4/scripting/python/samba/netcmd/processes.py b/python/samba/netcmd/processes.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/processes.py
rename to python/samba/netcmd/processes.py

diff --git a/source4/scripting/python/samba/netcmd/rodc.py b/python/samba/netcmd/rodc.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/rodc.py
rename to python/samba/netcmd/rodc.py

diff --git a/source4/scripting/python/samba/netcmd/sites.py b/python/samba/netcmd/sites.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/sites.py
rename to python/samba/netcmd/sites.py

diff --git a/source4/scripting/python/samba/netcmd/spn.py b/python/samba/netcmd/spn.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/spn.py
rename to python/samba/netcmd/spn.py

diff --git a/source4/scripting/python/samba/netcmd/testparm.py b/python/samba/netcmd/testparm.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/testparm.py
rename to python/samba/netcmd/testparm.py

diff --git a/source4/scripting/python/samba/netcmd/time.py b/python/samba/netcmd/time.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/time.py
rename to python/samba/netcmd/time.py

diff --git a/source4/scripting/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/user.py
rename to python/samba/netcmd/user.py

diff --git a/source4/scripting/python/samba/netcmd/vampire.py b/python/samba/netcmd/vampire.py
similarity index 100%
rename from source4/scripting/python/samba/netcmd/vampire.py
rename to python/samba/netcmd/vampire.py

diff --git a/source4/scripting/python/samba/ntacls.py b/python/samba/ntacls.py
similarity index 100%
rename from source4/scripting/python/samba/ntacls.py
rename to python/samba/ntacls.py

diff --git a/source4/scripting/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
similarity index 100%
rename from source4/scripting/python/samba/provision/__init__.py
rename to python/samba/provision/__init__.py

diff --git a/source4/scripting/python/samba/provision/backend.py b/python/samba/provision/backend.py
similarity index 100%
rename from source4/scripting/python/samba/provision/backend.py
rename to python/samba/provision/backend.py

diff --git a/source4/scripting/python/samba/provision/common.py b/python/samba/provision/common.py
similarity index 100%
rename from source4/scripting/python/samba/provision/common.py
rename to python/samba/provision/common.py

diff --git a/source4/scripting/python/samba/provision/descriptor.py b/python/samba/provision/descriptor.py
similarity index 100%
rename from source4/scripting/python/samba/provision/descriptor.py
rename to python/samba/provision/descriptor.py

diff --git a/source4/scripting/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
similarity index 100%
rename from source4/scripting/python/samba/provision/sambadns.py
rename to python/samba/provision/sambadns.py

diff --git a/source4/scripting/python/samba/samba3/__init__.py b/python/samba/samba3/__init__.py
similarity index 100%
rename from source4/scripting/python/samba/samba3/__init__.py
rename to python/samba/samba3/__init__.py

diff --git a/source4/scripting/python/samba/samdb.py b/python/samba/samdb.py
similarity index 100%
rename from source4/scripting/python/samba/samdb.py
rename to python/samba/samdb.py

diff --git a/source4/scripting/python/samba/schema.py b/python/samba/schema.py
similarity index 100%
rename from source4/scripting/python/samba/schema.py
rename to python/samba/schema.py

diff --git a/source4/scripting/python/samba/sd_utils.py b/python/samba/sd_utils.py
similarity index 100%
rename from source4/scripting/python/samba/sd_utils.py
rename to python/samba/sd_utils.py

diff --git a/source4/scripting/python/samba/sites.py b/python/samba/sites.py
similarity index 100%
rename from source4/scripting/python/samba/sites.py
rename to python/samba/sites.py

diff --git a/source4/scripting/python/samba/tdb_util.py b/python/samba/tdb_util.py
similarity index 100%
rename from source4/scripting/python/samba/tdb_util.py
rename to python/samba/tdb_util.py

diff --git a/source4/scripting/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
similarity index 100%
rename from source4/scripting/python/samba/tests/__init__.py
rename to python/samba/tests/__init__.py

diff --git a/source4/scripting/python/samba/tests/auth.py b/python/samba/tests/auth.py
similarity index 100%
rename from source4/scripting/python/samba/tests/auth.py
rename to python/samba/tests/auth.py

diff --git a/source4/scripting/python/samba/tests/blackbox/__init__.py b/python/samba/tests/blackbox/__init__.py
similarity index 100%
rename from source4/scripting/python/samba/tests/blackbox/__init__.py
rename to python/samba/tests/blackbox/__init__.py

diff --git a/source4/scripting/python/samba/tests/blackbox/ndrdump.py b/python/samba/tests/blackbox/ndrdump.py
similarity index 100%
rename from source4/scripting/python/samba/tests/blackbox/ndrdump.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/blackbox/samba_tool_drs.py
rename to python/samba/tests/blackbox/samba_tool_drs.py

diff --git a/source4/scripting/python/samba/tests/common.py b/python/samba/tests/common.py
similarity index 100%
rename from source4/scripting/python/samba/tests/common.py
rename to python/samba/tests/common.py

diff --git a/source4/scripting/python/samba/tests/core.py b/python/samba/tests/core.py
similarity index 100%
rename from source4/scripting/python/samba/tests/core.py
rename to python/samba/tests/core.py

diff --git a/source4/scripting/python/samba/tests/credentials.py b/python/samba/tests/credentials.py
similarity index 100%
rename from source4/scripting/python/samba/tests/credentials.py
rename to python/samba/tests/credentials.py

diff --git a/source4/scripting/python/samba/tests/dcerpc/__init__.py b/python/samba/tests/dcerpc/__init__.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/__init__.py
rename to python/samba/tests/dcerpc/__init__.py

diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/python/samba/tests/dcerpc/bare.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/bare.py
rename to python/samba/tests/dcerpc/bare.py

diff --git a/source4/scripting/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/dnsserver.py
rename to python/samba/tests/dcerpc/dnsserver.py

diff --git a/source4/scripting/python/samba/tests/dcerpc/misc.py b/python/samba/tests/dcerpc/misc.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/misc.py
rename to python/samba/tests/dcerpc/misc.py

diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/python/samba/tests/dcerpc/registry.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/registry.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/rpc_talloc.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/rpcecho.py
rename to python/samba/tests/dcerpc/rpcecho.py

diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/python/samba/tests/dcerpc/sam.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/sam.py
rename to python/samba/tests/dcerpc/sam.py

diff --git a/source4/scripting/python/samba/tests/dcerpc/srvsvc.py b/python/samba/tests/dcerpc/srvsvc.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/srvsvc.py
rename to python/samba/tests/dcerpc/srvsvc.py

diff --git a/source4/scripting/python/samba/tests/dcerpc/testrpc.py b/python/samba/tests/dcerpc/testrpc.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/testrpc.py
rename to python/samba/tests/dcerpc/testrpc.py

diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/python/samba/tests/dcerpc/unix.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/unix.py
rename to python/samba/tests/dcerpc/unix.py

diff --git a/source4/scripting/python/samba/tests/dns.py b/python/samba/tests/dns.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dns.py
rename to python/samba/tests/dns.py

diff --git a/source4/scripting/python/samba/tests/docs.py b/python/samba/tests/docs.py
similarity index 100%
rename from source4/scripting/python/samba/tests/docs.py
rename to python/samba/tests/docs.py

diff --git a/source4/scripting/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dsdb.py
rename to python/samba/tests/dsdb.py

diff --git a/source4/scripting/python/samba/tests/gensec.py b/python/samba/tests/gensec.py
similarity index 100%
rename from source4/scripting/python/samba/tests/gensec.py
rename to python/samba/tests/gensec.py

diff --git a/source4/scripting/python/samba/tests/getopt.py b/python/samba/tests/getopt.py
similarity index 100%
rename from source4/scripting/python/samba/tests/getopt.py
rename to python/samba/tests/getopt.py

diff --git a/source4/scripting/python/samba/tests/hostconfig.py b/python/samba/tests/hostconfig.py
similarity index 100%
rename from source4/scripting/python/samba/tests/hostconfig.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/libsmb_samba_internal.py
rename to python/samba/tests/libsmb_samba_internal.py

diff --git a/source4/scripting/python/samba/tests/messaging.py b/python/samba/tests/messaging.py
similarity index 100%
rename from source4/scripting/python/samba/tests/messaging.py
rename to python/samba/tests/messaging.py

diff --git a/source4/scripting/python/samba/tests/netcmd.py b/python/samba/tests/netcmd.py
similarity index 100%
rename from source4/scripting/python/samba/tests/netcmd.py
rename to python/samba/tests/netcmd.py

diff --git a/source4/scripting/python/samba/tests/ntacls.py b/python/samba/tests/ntacls.py
similarity index 100%
rename from source4/scripting/python/samba/tests/ntacls.py
rename to python/samba/tests/ntacls.py

diff --git a/source4/scripting/python/samba/tests/param.py b/python/samba/tests/param.py
similarity index 100%
rename from source4/scripting/python/samba/tests/param.py
rename to python/samba/tests/param.py

diff --git a/source4/scripting/python/samba/tests/policy.py b/python/samba/tests/policy.py
similarity index 100%
rename from source4/scripting/python/samba/tests/policy.py
rename to python/samba/tests/policy.py

diff --git a/source4/scripting/python/samba/tests/posixacl.py b/python/samba/tests/posixacl.py
similarity index 100%
rename from source4/scripting/python/samba/tests/posixacl.py
rename to python/samba/tests/posixacl.py

diff --git a/source4/scripting/python/samba/tests/provision.py b/python/samba/tests/provision.py
similarity index 100%
rename from source4/scripting/python/samba/tests/provision.py
rename to python/samba/tests/provision.py

diff --git a/source4/scripting/python/samba/tests/registry.py b/python/samba/tests/registry.py
similarity index 100%
rename from source4/scripting/python/samba/tests/registry.py
rename to python/samba/tests/registry.py

diff --git a/source4/scripting/python/samba/tests/samba3.py b/python/samba/tests/samba3.py
similarity index 100%
rename from source4/scripting/python/samba/tests/samba3.py
rename to python/samba/tests/samba3.py

diff --git a/source4/scripting/python/samba/tests/samba3sam.py b/python/samba/tests/samba3sam.py
similarity index 100%
rename from source4/scripting/python/samba/tests/samba3sam.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/samba_tool/__init__.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/samba_tool/base.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/samba_tool/gpo.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/samba_tool/group.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/samba_tool/ntacl.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/samba_tool/processes.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/samba_tool/timecmd.py
rename to 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
similarity index 100%
rename from source4/scripting/python/samba/tests/samba_tool/user.py
rename to python/samba/tests/samba_tool/user.py

diff --git a/source4/scripting/python/samba/tests/samdb.py b/python/samba/tests/samdb.py
similarity index 100%
rename from source4/scripting/python/samba/tests/samdb.py
rename to python/samba/tests/samdb.py

diff --git a/source4/scripting/python/samba/tests/security.py b/python/samba/tests/security.py
similarity index 100%
rename from source4/scripting/python/samba/tests/security.py
rename to python/samba/tests/security.py

diff --git a/source4/scripting/python/samba/tests/source.py b/python/samba/tests/source.py
similarity index 100%
rename from source4/scripting/python/samba/tests/source.py
rename to python/samba/tests/source.py

diff --git a/source4/scripting/python/samba/tests/strings.py b/python/samba/tests/strings.py
similarity index 100%
rename from source4/scripting/python/samba/tests/strings.py
rename to python/samba/tests/strings.py

diff --git a/source4/scripting/python/samba/tests/unicodenames.py b/python/samba/tests/unicodenames.py
similarity index 100%
rename from source4/scripting/python/samba/tests/unicodenames.py
rename to python/samba/tests/unicodenames.py

diff --git a/source4/scripting/python/samba/tests/upgrade.py b/python/samba/tests/upgrade.py
similarity index 100%
rename from source4/scripting/python/samba/tests/upgrade.py
rename to python/samba/tests/upgrade.py

diff --git a/source4/scripting/python/samba/tests/upgradeprovision.py b/python/samba/tests/upgradeprovision.py
similarity index 100%
rename from source4/scripting/python/samba/tests/upgradeprovision.py
rename to python/samba/tests/upgradeprovision.py

diff --git a/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py b/python/samba/tests/upgradeprovisionneeddc.py
similarity index 100%
rename from source4/scripting/python/samba/tests/upgradeprovisionneeddc.py
rename to python/samba/tests/upgradeprovisionneeddc.py

diff --git a/source4/scripting/python/samba/tests/xattr.py b/python/samba/tests/xattr.py
similarity index 100%
rename from source4/scripting/python/samba/tests/xattr.py
rename to python/samba/tests/xattr.py

diff --git a/source4/scripting/python/samba/upgrade.py b/python/samba/upgrade.py
similarity index 100%
rename from source4/scripting/python/samba/upgrade.py
rename to python/samba/upgrade.py

diff --git a/source4/scripting/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py
similarity index 100%
rename from source4/scripting/python/samba/upgradehelpers.py
rename to python/samba/upgradehelpers.py

diff --git a/source4/scripting/python/samba/web_server/__init__.py b/python/samba/web_server/__init__.py
similarity index 100%
rename from source4/scripting/python/samba/web_server/__init__.py
rename to python/samba/web_server/__init__.py

diff --git a/source4/scripting/python/samba/xattr.py b/python/samba/xattr.py
similarity index 100%
rename from source4/scripting/python/samba/xattr.py
rename to python/samba/xattr.py

diff --git a/source4/scripting/python/samba_external/README b/python/samba_external/README
similarity index 100%
rename from source4/scripting/python/samba_external/README
rename to python/samba_external/README

diff --git a/source4/scripting/python/uuidmodule.c b/python/uuidmodule.c
similarity index 100%
rename from source4/scripting/python/uuidmodule.c
rename to python/uuidmodule.c

diff --git a/source4/scripting/python/wscript_build b/python/wscript_build
similarity index 100%
rename from source4/scripting/python/wscript_build
rename to python/wscript_build

diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index a84fbf8e718785ea44a5168ca419934871ce9d6d..02e5ae28cec1d4551d7a9fcee16ec7f6559a722b 100644 (file)
--- 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 3901d4d599c11cec262dca8853cbd0b49b613087..d035fb024a74d82bf1d0440c729c8b463123cf9f 100644 (file)
--- 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 298e1c3bfa58130190947307ff2f75039e1f847f..cdd28d8542c78fdded66de03af845156f8098f32 100644 (file)
--- 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 15a78bf499b8f8ec46f5e1925680ea8cd2d7fab9..918195e84294fb6792ab9a9e1415ffff4f27e9cc 100755 (executable)
--- 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 17ad65afe41276781bd583573656688dd892d46e..f0e7bd59b854d26f60c008f60466942190d8cad4 100644 (file)
--- 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 ec673cee13732b9284fa47bd55988bdd5fd8ad48..f0c9f2a5b3d1ea544f04e8de1751936af09b63c1 100644 (file)
--- 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')