From 87afc3aee1ea593069322a49355dd8780d99e123 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 28 Dec 2012 15:37:14 +0100 Subject: [PATCH] Move python modules from source4/scripting/python/ to python/. Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Sat Mar 2 03:57:34 CET 2013 on sn-devel-104 --- libcli/nbt/pynbt.c | 2 +- {source4/scripting/python => python}/examples/dnsserver.py | 0 {source4/scripting/python => python}/examples/netbios.py | 0 {source4/scripting/python => python}/examples/samr.py | 0 {source4/scripting/python => python}/examples/winreg.py | 0 {source4/scripting/python => python}/modules.c | 2 +- {source4/scripting/python => python}/modules.h | 0 {source4/scripting/python => python}/pyglue.c | 0 {source4/scripting/python => python}/samba/__init__.py | 0 {source4/scripting/python => python}/samba/common.py | 0 {source4/scripting/python => python}/samba/dbchecker.py | 0 {source4/scripting/python => python}/samba/drs_utils.py | 0 {source4/scripting/python => python}/samba/getopt.py | 0 {source4/scripting/python => python}/samba/hostconfig.py | 0 {source4/scripting/python => python}/samba/idmap.py | 0 {source4/scripting/python => python}/samba/join.py | 0 {source4/scripting/python => python}/samba/kcc_utils.py | 0 .../scripting/python => python}/samba/ms_display_specifiers.py | 0 {source4/scripting/python => python}/samba/ms_schema.py | 0 {source4/scripting/python => python}/samba/ndr.py | 0 {source4/scripting/python => python}/samba/netcmd/__init__.py | 0 {source4/scripting/python => python}/samba/netcmd/common.py | 0 {source4/scripting/python => python}/samba/netcmd/dbcheck.py | 0 {source4/scripting/python => python}/samba/netcmd/delegation.py | 0 {source4/scripting/python => python}/samba/netcmd/dns.py | 0 {source4/scripting/python => python}/samba/netcmd/domain.py | 0 {source4/scripting/python => python}/samba/netcmd/drs.py | 0 {source4/scripting/python => python}/samba/netcmd/dsacl.py | 0 {source4/scripting/python => python}/samba/netcmd/fsmo.py | 0 {source4/scripting/python => python}/samba/netcmd/gpo.py | 0 {source4/scripting/python => python}/samba/netcmd/group.py | 0 {source4/scripting/python => python}/samba/netcmd/ldapcmp.py | 0 {source4/scripting/python => python}/samba/netcmd/main.py | 0 {source4/scripting/python => python}/samba/netcmd/ntacl.py | 0 {source4/scripting/python => python}/samba/netcmd/processes.py | 0 {source4/scripting/python => python}/samba/netcmd/rodc.py | 0 {source4/scripting/python => python}/samba/netcmd/sites.py | 0 {source4/scripting/python => python}/samba/netcmd/spn.py | 0 {source4/scripting/python => python}/samba/netcmd/testparm.py | 0 {source4/scripting/python => python}/samba/netcmd/time.py | 0 {source4/scripting/python => python}/samba/netcmd/user.py | 0 {source4/scripting/python => python}/samba/netcmd/vampire.py | 0 {source4/scripting/python => python}/samba/ntacls.py | 0 .../scripting/python => python}/samba/provision/__init__.py | 0 {source4/scripting/python => python}/samba/provision/backend.py | 0 {source4/scripting/python => python}/samba/provision/common.py | 0 .../scripting/python => python}/samba/provision/descriptor.py | 0 .../scripting/python => python}/samba/provision/sambadns.py | 0 {source4/scripting/python => python}/samba/samba3/__init__.py | 0 {source4/scripting/python => python}/samba/samdb.py | 0 {source4/scripting/python => python}/samba/schema.py | 0 {source4/scripting/python => python}/samba/sd_utils.py | 0 {source4/scripting/python => python}/samba/sites.py | 0 {source4/scripting/python => python}/samba/tdb_util.py | 0 {source4/scripting/python => python}/samba/tests/__init__.py | 0 {source4/scripting/python => python}/samba/tests/auth.py | 0 .../python => python}/samba/tests/blackbox/__init__.py | 0 .../scripting/python => python}/samba/tests/blackbox/ndrdump.py | 0 .../python => python}/samba/tests/blackbox/samba_tool_drs.py | 0 {source4/scripting/python => python}/samba/tests/common.py | 0 {source4/scripting/python => python}/samba/tests/core.py | 0 {source4/scripting/python => python}/samba/tests/credentials.py | 0 .../scripting/python => python}/samba/tests/dcerpc/__init__.py | 0 {source4/scripting/python => python}/samba/tests/dcerpc/bare.py | 0 .../scripting/python => python}/samba/tests/dcerpc/dnsserver.py | 0 {source4/scripting/python => python}/samba/tests/dcerpc/misc.py | 0 .../scripting/python => python}/samba/tests/dcerpc/registry.py | 0 .../python => python}/samba/tests/dcerpc/rpc_talloc.py | 0 .../scripting/python => python}/samba/tests/dcerpc/rpcecho.py | 0 {source4/scripting/python => python}/samba/tests/dcerpc/sam.py | 0 .../scripting/python => python}/samba/tests/dcerpc/srvsvc.py | 0 .../scripting/python => python}/samba/tests/dcerpc/testrpc.py | 0 {source4/scripting/python => python}/samba/tests/dcerpc/unix.py | 0 {source4/scripting/python => python}/samba/tests/dns.py | 0 {source4/scripting/python => python}/samba/tests/docs.py | 0 {source4/scripting/python => python}/samba/tests/dsdb.py | 0 {source4/scripting/python => python}/samba/tests/gensec.py | 0 {source4/scripting/python => python}/samba/tests/getopt.py | 0 {source4/scripting/python => python}/samba/tests/hostconfig.py | 0 .../python => python}/samba/tests/libsmb_samba_internal.py | 0 {source4/scripting/python => python}/samba/tests/messaging.py | 0 {source4/scripting/python => python}/samba/tests/netcmd.py | 0 {source4/scripting/python => python}/samba/tests/ntacls.py | 0 {source4/scripting/python => python}/samba/tests/param.py | 0 {source4/scripting/python => python}/samba/tests/policy.py | 0 {source4/scripting/python => python}/samba/tests/posixacl.py | 0 {source4/scripting/python => python}/samba/tests/provision.py | 0 {source4/scripting/python => python}/samba/tests/registry.py | 0 {source4/scripting/python => python}/samba/tests/samba3.py | 0 {source4/scripting/python => python}/samba/tests/samba3sam.py | 0 .../python => python}/samba/tests/samba_tool/__init__.py | 0 .../scripting/python => python}/samba/tests/samba_tool/base.py | 0 .../scripting/python => python}/samba/tests/samba_tool/gpo.py | 0 .../scripting/python => python}/samba/tests/samba_tool/group.py | 0 .../scripting/python => python}/samba/tests/samba_tool/ntacl.py | 0 .../python => python}/samba/tests/samba_tool/processes.py | 0 .../python => python}/samba/tests/samba_tool/timecmd.py | 0 .../scripting/python => python}/samba/tests/samba_tool/user.py | 0 {source4/scripting/python => python}/samba/tests/samdb.py | 0 {source4/scripting/python => python}/samba/tests/security.py | 0 {source4/scripting/python => python}/samba/tests/source.py | 0 {source4/scripting/python => python}/samba/tests/strings.py | 0 .../scripting/python => python}/samba/tests/unicodenames.py | 0 {source4/scripting/python => python}/samba/tests/upgrade.py | 0 .../scripting/python => python}/samba/tests/upgradeprovision.py | 0 .../python => python}/samba/tests/upgradeprovisionneeddc.py | 0 {source4/scripting/python => python}/samba/tests/xattr.py | 0 {source4/scripting/python => python}/samba/upgrade.py | 0 {source4/scripting/python => python}/samba/upgradehelpers.py | 0 .../scripting/python => python}/samba/web_server/__init__.py | 0 {source4/scripting/python => python}/samba/xattr.py | 0 {source4/scripting/python => python}/samba_external/README | 0 {source4/scripting/python => python}/uuidmodule.c | 0 {source4/scripting/python => python}/wscript_build | 0 source4/auth/gensec/pygensec.c | 2 +- source4/lib/messaging/pymessaging.c | 2 +- source4/param/provision.c | 2 +- source4/scripting/bin/subunitrun | 2 +- source4/web_server/wsgi.c | 2 +- wscript_build | 2 +- 120 files changed, 8 insertions(+), 8 deletions(-) rename {source4/scripting/python => python}/examples/dnsserver.py (100%) rename {source4/scripting/python => python}/examples/netbios.py (100%) rename {source4/scripting/python => python}/examples/samr.py (100%) rename {source4/scripting/python => python}/examples/winreg.py (100%) rename {source4/scripting/python => python}/modules.c (97%) rename {source4/scripting/python => python}/modules.h (100%) rename {source4/scripting/python => python}/pyglue.c (100%) rename {source4/scripting/python => python}/samba/__init__.py (100%) rename {source4/scripting/python => python}/samba/common.py (100%) rename {source4/scripting/python => python}/samba/dbchecker.py (100%) rename {source4/scripting/python => python}/samba/drs_utils.py (100%) rename {source4/scripting/python => python}/samba/getopt.py (100%) rename {source4/scripting/python => python}/samba/hostconfig.py (100%) rename {source4/scripting/python => python}/samba/idmap.py (100%) rename {source4/scripting/python => python}/samba/join.py (100%) rename {source4/scripting/python => python}/samba/kcc_utils.py (100%) rename {source4/scripting/python => python}/samba/ms_display_specifiers.py (100%) rename {source4/scripting/python => python}/samba/ms_schema.py (100%) rename {source4/scripting/python => python}/samba/ndr.py (100%) rename {source4/scripting/python => python}/samba/netcmd/__init__.py (100%) rename {source4/scripting/python => python}/samba/netcmd/common.py (100%) rename {source4/scripting/python => python}/samba/netcmd/dbcheck.py (100%) rename {source4/scripting/python => python}/samba/netcmd/delegation.py (100%) rename {source4/scripting/python => python}/samba/netcmd/dns.py (100%) rename {source4/scripting/python => python}/samba/netcmd/domain.py (100%) rename {source4/scripting/python => python}/samba/netcmd/drs.py (100%) rename {source4/scripting/python => python}/samba/netcmd/dsacl.py (100%) rename {source4/scripting/python => python}/samba/netcmd/fsmo.py (100%) rename {source4/scripting/python => python}/samba/netcmd/gpo.py (100%) rename {source4/scripting/python => python}/samba/netcmd/group.py (100%) rename {source4/scripting/python => python}/samba/netcmd/ldapcmp.py (100%) rename {source4/scripting/python => python}/samba/netcmd/main.py (100%) rename {source4/scripting/python => python}/samba/netcmd/ntacl.py (100%) rename {source4/scripting/python => python}/samba/netcmd/processes.py (100%) rename {source4/scripting/python => python}/samba/netcmd/rodc.py (100%) rename {source4/scripting/python => python}/samba/netcmd/sites.py (100%) rename {source4/scripting/python => python}/samba/netcmd/spn.py (100%) rename {source4/scripting/python => python}/samba/netcmd/testparm.py (100%) rename {source4/scripting/python => python}/samba/netcmd/time.py (100%) rename {source4/scripting/python => python}/samba/netcmd/user.py (100%) rename {source4/scripting/python => python}/samba/netcmd/vampire.py (100%) rename {source4/scripting/python => python}/samba/ntacls.py (100%) rename {source4/scripting/python => python}/samba/provision/__init__.py (100%) rename {source4/scripting/python => python}/samba/provision/backend.py (100%) rename {source4/scripting/python => python}/samba/provision/common.py (100%) rename {source4/scripting/python => python}/samba/provision/descriptor.py (100%) rename {source4/scripting/python => python}/samba/provision/sambadns.py (100%) rename {source4/scripting/python => python}/samba/samba3/__init__.py (100%) rename {source4/scripting/python => python}/samba/samdb.py (100%) rename {source4/scripting/python => python}/samba/schema.py (100%) rename {source4/scripting/python => python}/samba/sd_utils.py (100%) rename {source4/scripting/python => python}/samba/sites.py (100%) rename {source4/scripting/python => python}/samba/tdb_util.py (100%) rename {source4/scripting/python => python}/samba/tests/__init__.py (100%) rename {source4/scripting/python => python}/samba/tests/auth.py (100%) rename {source4/scripting/python => python}/samba/tests/blackbox/__init__.py (100%) rename {source4/scripting/python => python}/samba/tests/blackbox/ndrdump.py (100%) rename {source4/scripting/python => python}/samba/tests/blackbox/samba_tool_drs.py (100%) rename {source4/scripting/python => python}/samba/tests/common.py (100%) rename {source4/scripting/python => python}/samba/tests/core.py (100%) rename {source4/scripting/python => python}/samba/tests/credentials.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/__init__.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/bare.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/dnsserver.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/misc.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/registry.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/rpc_talloc.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/rpcecho.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/sam.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/srvsvc.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/testrpc.py (100%) rename {source4/scripting/python => python}/samba/tests/dcerpc/unix.py (100%) rename {source4/scripting/python => python}/samba/tests/dns.py (100%) rename {source4/scripting/python => python}/samba/tests/docs.py (100%) rename {source4/scripting/python => python}/samba/tests/dsdb.py (100%) rename {source4/scripting/python => python}/samba/tests/gensec.py (100%) rename {source4/scripting/python => python}/samba/tests/getopt.py (100%) rename {source4/scripting/python => python}/samba/tests/hostconfig.py (100%) rename {source4/scripting/python => python}/samba/tests/libsmb_samba_internal.py (100%) rename {source4/scripting/python => python}/samba/tests/messaging.py (100%) rename {source4/scripting/python => python}/samba/tests/netcmd.py (100%) rename {source4/scripting/python => python}/samba/tests/ntacls.py (100%) rename {source4/scripting/python => python}/samba/tests/param.py (100%) rename {source4/scripting/python => python}/samba/tests/policy.py (100%) rename {source4/scripting/python => python}/samba/tests/posixacl.py (100%) rename {source4/scripting/python => python}/samba/tests/provision.py (100%) rename {source4/scripting/python => python}/samba/tests/registry.py (100%) rename {source4/scripting/python => python}/samba/tests/samba3.py (100%) rename {source4/scripting/python => python}/samba/tests/samba3sam.py (100%) rename {source4/scripting/python => python}/samba/tests/samba_tool/__init__.py (100%) rename {source4/scripting/python => python}/samba/tests/samba_tool/base.py (100%) rename {source4/scripting/python => python}/samba/tests/samba_tool/gpo.py (100%) rename {source4/scripting/python => python}/samba/tests/samba_tool/group.py (100%) rename {source4/scripting/python => python}/samba/tests/samba_tool/ntacl.py (100%) rename {source4/scripting/python => python}/samba/tests/samba_tool/processes.py (100%) rename {source4/scripting/python => python}/samba/tests/samba_tool/timecmd.py (100%) rename {source4/scripting/python => python}/samba/tests/samba_tool/user.py (100%) rename {source4/scripting/python => python}/samba/tests/samdb.py (100%) rename {source4/scripting/python => python}/samba/tests/security.py (100%) rename {source4/scripting/python => python}/samba/tests/source.py (100%) rename {source4/scripting/python => python}/samba/tests/strings.py (100%) rename {source4/scripting/python => python}/samba/tests/unicodenames.py (100%) rename {source4/scripting/python => python}/samba/tests/upgrade.py (100%) rename {source4/scripting/python => python}/samba/tests/upgradeprovision.py (100%) rename {source4/scripting/python => python}/samba/tests/upgradeprovisionneeddc.py (100%) rename {source4/scripting/python => python}/samba/tests/xattr.py (100%) rename {source4/scripting/python => python}/samba/upgrade.py (100%) rename {source4/scripting/python => python}/samba/upgradehelpers.py (100%) rename {source4/scripting/python => python}/samba/web_server/__init__.py (100%) rename {source4/scripting/python => python}/samba/xattr.py (100%) rename {source4/scripting/python => python}/samba_external/README (100%) rename {source4/scripting/python => python}/uuidmodule.c (100%) rename {source4/scripting/python => python}/wscript_build (100%) 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 #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 78cdbc0d879..371f0d5a07a 100644 --- a/source4/scripting/python/modules.c +++ b/python/modules.c @@ -19,7 +19,7 @@ #include #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 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 #include #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 #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 -#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] ' 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') -- 2.34.1