[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Mon Mar 29 10:05:57 MDT 2010
The branch, master has been updated
via 1ec2b2f... ldap.py: Fix syntax error.
via 336cd5a... python: Fix rule for generating docs using pydoctor.
via 082e7f2... subunit: Update to newer upstream version.
via c873329... s4-python: Simplify mechanism for finding included Python modules.
via 4bbc3ff... s4-python: Move dnspython to lib/, like the other Python modules
via 89aa3b7... s4-python: Format to PEP8, simplify tests.
from 87ad4e9... Make the smbta-util manpage xml create smbta-util.8 instead of smbta-tool.8
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1ec2b2f7f328abd0111f1dd871a032ea32f5e573
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 29 18:05:03 2010 +0200
ldap.py: Fix syntax error.
commit 336cd5a0a3d35b998b67efc975813ccc8482e6ee
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 29 17:35:20 2010 +0200
python: Fix rule for generating docs using pydoctor.
commit 082e7f20d7df457c08119eb41fc2f3f8c09ba7ab
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 29 16:25:03 2010 +0200
subunit: Update to newer upstream version.
commit c87332950043471e52b924f7498b63982ec4302c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 29 16:21:26 2010 +0200
s4-python: Simplify mechanism for finding included Python modules.
commit 4bbc3ff037026c72f3249f59c1b5af69a6ad6d69
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 29 16:08:11 2010 +0200
s4-python: Move dnspython to lib/, like the other Python modules
This also avoids it from being installed if it's already present on the
system.
commit 89aa3b766b926d19dac4805a7e72433e497ce872
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 29 15:43:43 2010 +0200
s4-python: Format to PEP8, simplify tests.
-----------------------------------------------------------------------
Summary of changes:
lib/README | 3 +
.../samba_external => lib}/dnspython/ChangeLog | 0
.../samba_external => lib}/dnspython/LICENSE | 0
.../samba_external => lib}/dnspython/PKG-INFO | 0
.../python/samba_external => lib}/dnspython/README | 0
.../python/samba_external => lib}/dnspython/TODO | 0
.../dnspython/dns/__init__.py | 0
.../samba_external => lib}/dnspython/dns/dnssec.py | 0
.../samba_external => lib}/dnspython/dns/e164.py | 0
.../samba_external => lib}/dnspython/dns/edns.py | 0
.../dnspython/dns/entropy.py | 0
.../dnspython/dns/exception.py | 0
.../samba_external => lib}/dnspython/dns/flags.py | 0
.../samba_external => lib}/dnspython/dns/inet.py | 0
.../samba_external => lib}/dnspython/dns/ipv4.py | 0
.../samba_external => lib}/dnspython/dns/ipv6.py | 0
.../dnspython/dns/message.py | 0
.../samba_external => lib}/dnspython/dns/name.py | 0
.../dnspython/dns/namedict.py | 0
.../samba_external => lib}/dnspython/dns/node.py | 0
.../samba_external => lib}/dnspython/dns/opcode.py | 0
.../samba_external => lib}/dnspython/dns/query.py | 0
.../samba_external => lib}/dnspython/dns/rcode.py | 0
.../samba_external => lib}/dnspython/dns/rdata.py | 0
.../dnspython/dns/rdataclass.py | 0
.../dnspython/dns/rdataset.py | 0
.../dnspython/dns/rdatatype.py | 0
.../dnspython/dns/rdtypes/ANY/AFSDB.py | 0
.../dnspython/dns/rdtypes/ANY/CERT.py | 0
.../dnspython/dns/rdtypes/ANY/CNAME.py | 0
.../dnspython/dns/rdtypes/ANY/DLV.py | 0
.../dnspython/dns/rdtypes/ANY/DNAME.py | 0
.../dnspython/dns/rdtypes/ANY/DNSKEY.py | 0
.../dnspython/dns/rdtypes/ANY/DS.py | 0
.../dnspython/dns/rdtypes/ANY/GPOS.py | 0
.../dnspython/dns/rdtypes/ANY/HINFO.py | 0
.../dnspython/dns/rdtypes/ANY/HIP.py | 0
.../dnspython/dns/rdtypes/ANY/ISDN.py | 0
.../dnspython/dns/rdtypes/ANY/KEY.py | 0
.../dnspython/dns/rdtypes/ANY/LOC.py | 0
.../dnspython/dns/rdtypes/ANY/MX.py | 0
.../dnspython/dns/rdtypes/ANY/NS.py | 0
.../dnspython/dns/rdtypes/ANY/NSEC.py | 0
.../dnspython/dns/rdtypes/ANY/NSEC3.py | 0
.../dnspython/dns/rdtypes/ANY/NSEC3PARAM.py | 0
.../dnspython/dns/rdtypes/ANY/NXT.py | 0
.../dnspython/dns/rdtypes/ANY/PTR.py | 0
.../dnspython/dns/rdtypes/ANY/RP.py | 0
.../dnspython/dns/rdtypes/ANY/RRSIG.py | 0
.../dnspython/dns/rdtypes/ANY/RT.py | 0
.../dnspython/dns/rdtypes/ANY/SIG.py | 0
.../dnspython/dns/rdtypes/ANY/SOA.py | 0
.../dnspython/dns/rdtypes/ANY/SPF.py | 0
.../dnspython/dns/rdtypes/ANY/SSHFP.py | 0
.../dnspython/dns/rdtypes/ANY/TXT.py | 0
.../dnspython/dns/rdtypes/ANY/X25.py | 0
.../dnspython/dns/rdtypes/ANY/__init__.py | 0
.../dnspython/dns/rdtypes/IN/A.py | 0
.../dnspython/dns/rdtypes/IN/AAAA.py | 0
.../dnspython/dns/rdtypes/IN/APL.py | 0
.../dnspython/dns/rdtypes/IN/DHCID.py | 0
.../dnspython/dns/rdtypes/IN/IPSECKEY.py | 0
.../dnspython/dns/rdtypes/IN/KX.py | 0
.../dnspython/dns/rdtypes/IN/NAPTR.py | 0
.../dnspython/dns/rdtypes/IN/NSAP.py | 0
.../dnspython/dns/rdtypes/IN/NSAP_PTR.py | 0
.../dnspython/dns/rdtypes/IN/PX.py | 0
.../dnspython/dns/rdtypes/IN/SRV.py | 0
.../dnspython/dns/rdtypes/IN/WKS.py | 0
.../dnspython/dns/rdtypes/IN/__init__.py | 0
.../dnspython/dns/rdtypes/__init__.py | 0
.../dnspython/dns/rdtypes/dsbase.py | 0
.../dnspython/dns/rdtypes/keybase.py | 0
.../dnspython/dns/rdtypes/mxbase.py | 0
.../dnspython/dns/rdtypes/nsbase.py | 0
.../dnspython/dns/rdtypes/sigbase.py | 0
.../dnspython/dns/rdtypes/txtbase.py | 0
.../dnspython/dns/renderer.py | 0
.../dnspython/dns/resolver.py | 0
.../dnspython/dns/reversename.py | 0
.../samba_external => lib}/dnspython/dns/rrset.py | 0
.../samba_external => lib}/dnspython/dns/set.py | 0
.../dnspython/dns/tokenizer.py | 0
.../samba_external => lib}/dnspython/dns/tsig.py | 0
.../dnspython/dns/tsigkeyring.py | 0
.../samba_external => lib}/dnspython/dns/ttl.py | 0
.../samba_external => lib}/dnspython/dns/update.py | 0
.../dnspython/dns/version.py | 0
.../samba_external => lib}/dnspython/dns/zone.py | 0
.../dnspython/examples/ddns.py | 0
.../dnspython/examples/e164.py | 0
.../dnspython/examples/mx.py | 0
.../dnspython/examples/name.py | 0
.../dnspython/examples/reverse.py | 0
.../dnspython/examples/reverse_name.py | 0
.../dnspython/examples/xfr.py | 0
.../samba_external => lib}/dnspython/setup.py | 0
.../dnspython/tests/Makefile | 0
.../samba_external => lib}/dnspython/tests/bugs.py | 0
.../samba_external => lib}/dnspython/tests/example | 0
.../dnspython/tests/example1.good | 0
.../dnspython/tests/example2.good | 0
.../dnspython/tests/flags.py | 0
.../dnspython/tests/message.py | 0
.../samba_external => lib}/dnspython/tests/name.py | 0
.../dnspython/tests/namedict.py | 0
.../dnspython/tests/ntoaaton.py | 0
.../dnspython/tests/rdtypeandclass.py | 0
.../dnspython/tests/resolver.py | 0
.../dnspython/tests/rrset.py | 0
.../samba_external => lib}/dnspython/tests/set.py | 0
.../dnspython/tests/tokenizer.py | 0
.../dnspython/tests/update.py | 0
.../samba_external => lib}/dnspython/tests/zone.py | 0
lib/subunit/python/subunit/run.py | 2 +-
lib/subunit/python/subunit/test_results.py | 4 +-
lib/subunit/python/testtools/matchers.py | 31 ++++
.../python/testtools/tests/test_matchers.py | 13 ++
source4/build/make/python.mk | 3 -
source4/lib/ldb/tests/python/acl.py | 2 +-
source4/lib/ldb/tests/python/ldap.py | 39 +++---
source4/scripting/bin/samba_dnsupdate | 10 +-
source4/scripting/python/config.mk | 9 +-
source4/scripting/python/samba/__init__.py | 15 ++
source4/scripting/python/samba/external.py | 50 -------
source4/scripting/python/samba/ms_schema.py | 26 ++--
source4/scripting/python/samba/tests/ntacls.py | 155 +++++++++-----------
source4/scripting/python/samba/upgrade.py | 6 +-
128 files changed, 179 insertions(+), 189 deletions(-)
rename {source4/scripting/python/samba_external => lib}/dnspython/ChangeLog (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/LICENSE (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/PKG-INFO (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/README (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/TODO (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/__init__.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/dnssec.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/e164.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/edns.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/entropy.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/exception.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/flags.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/inet.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/ipv4.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/ipv6.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/message.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/name.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/namedict.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/node.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/opcode.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/query.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rcode.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdata.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdataclass.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdataset.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdatatype.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/AFSDB.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/CERT.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/CNAME.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/DLV.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/DNAME.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/DNSKEY.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/DS.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/GPOS.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/HINFO.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/HIP.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/ISDN.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/KEY.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/LOC.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/MX.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/NS.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/NSEC.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/NSEC3.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/NSEC3PARAM.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/NXT.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/PTR.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/RP.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/RRSIG.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/RT.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/SIG.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/SOA.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/SPF.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/SSHFP.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/TXT.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/X25.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/ANY/__init__.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/A.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/AAAA.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/APL.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/DHCID.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/IPSECKEY.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/KX.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/NAPTR.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/NSAP.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/NSAP_PTR.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/PX.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/SRV.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/WKS.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/IN/__init__.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/__init__.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/dsbase.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/keybase.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/mxbase.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/nsbase.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/sigbase.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rdtypes/txtbase.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/renderer.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/resolver.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/reversename.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/rrset.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/set.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/tokenizer.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/tsig.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/tsigkeyring.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/ttl.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/update.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/version.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/dns/zone.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/examples/ddns.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/examples/e164.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/examples/mx.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/examples/name.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/examples/reverse.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/examples/reverse_name.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/examples/xfr.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/setup.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/Makefile (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/bugs.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/example (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/example1.good (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/example2.good (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/flags.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/message.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/name.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/namedict.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/ntoaaton.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/rdtypeandclass.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/resolver.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/rrset.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/set.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/tokenizer.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/update.py (100%)
rename {source4/scripting/python/samba_external => lib}/dnspython/tests/zone.py (100%)
delete mode 100644 source4/scripting/python/samba/external.py
Changeset truncated at 500 lines:
diff --git a/lib/README b/lib/README
index acae62c..85b7952 100644
--- a/lib/README
+++ b/lib/README
@@ -1,4 +1,5 @@
compression - Various compression algorithms (MSZIP, lzxpress)
+dnspython - Python module for working with DNS.
nss_wrapper - Wrapper for the user and group NSS API allowing the use
of other data sources.
popt - Command-line option parsing library
@@ -6,6 +7,8 @@ replace - Provides replacements for standard (POSIX, C99) functions
not provided by the host platform.
socket_wrapper - Wrapper library allowing TCP/IP traffic to be redirected
over Unix domain sockets.
+subunit - Utilities and bindings for working with the Subunit test result
+ reporting protocol.
talloc - Hierarchical pool based memory allocator
tdb - Simple but fast key/value database library, supporting multiple writers
torture - Simple unit testing helper library
diff --git a/source4/scripting/python/samba_external/dnspython/ChangeLog b/lib/dnspython/ChangeLog
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/ChangeLog
rename to lib/dnspython/ChangeLog
diff --git a/source4/scripting/python/samba_external/dnspython/LICENSE b/lib/dnspython/LICENSE
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/LICENSE
rename to lib/dnspython/LICENSE
diff --git a/source4/scripting/python/samba_external/dnspython/PKG-INFO b/lib/dnspython/PKG-INFO
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/PKG-INFO
rename to lib/dnspython/PKG-INFO
diff --git a/source4/scripting/python/samba_external/dnspython/README b/lib/dnspython/README
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/README
rename to lib/dnspython/README
diff --git a/source4/scripting/python/samba_external/dnspython/TODO b/lib/dnspython/TODO
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/TODO
rename to lib/dnspython/TODO
diff --git a/source4/scripting/python/samba_external/dnspython/dns/__init__.py b/lib/dnspython/dns/__init__.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/__init__.py
rename to lib/dnspython/dns/__init__.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/dnssec.py b/lib/dnspython/dns/dnssec.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/dnssec.py
rename to lib/dnspython/dns/dnssec.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/e164.py b/lib/dnspython/dns/e164.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/e164.py
rename to lib/dnspython/dns/e164.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/edns.py b/lib/dnspython/dns/edns.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/edns.py
rename to lib/dnspython/dns/edns.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/entropy.py b/lib/dnspython/dns/entropy.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/entropy.py
rename to lib/dnspython/dns/entropy.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/exception.py b/lib/dnspython/dns/exception.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/exception.py
rename to lib/dnspython/dns/exception.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/flags.py b/lib/dnspython/dns/flags.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/flags.py
rename to lib/dnspython/dns/flags.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/inet.py b/lib/dnspython/dns/inet.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/inet.py
rename to lib/dnspython/dns/inet.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/ipv4.py b/lib/dnspython/dns/ipv4.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/ipv4.py
rename to lib/dnspython/dns/ipv4.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/ipv6.py b/lib/dnspython/dns/ipv6.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/ipv6.py
rename to lib/dnspython/dns/ipv6.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/message.py b/lib/dnspython/dns/message.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/message.py
rename to lib/dnspython/dns/message.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/name.py b/lib/dnspython/dns/name.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/name.py
rename to lib/dnspython/dns/name.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/namedict.py b/lib/dnspython/dns/namedict.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/namedict.py
rename to lib/dnspython/dns/namedict.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/node.py b/lib/dnspython/dns/node.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/node.py
rename to lib/dnspython/dns/node.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/opcode.py b/lib/dnspython/dns/opcode.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/opcode.py
rename to lib/dnspython/dns/opcode.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/query.py b/lib/dnspython/dns/query.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/query.py
rename to lib/dnspython/dns/query.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rcode.py b/lib/dnspython/dns/rcode.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rcode.py
rename to lib/dnspython/dns/rcode.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdata.py b/lib/dnspython/dns/rdata.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdata.py
rename to lib/dnspython/dns/rdata.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdataclass.py b/lib/dnspython/dns/rdataclass.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdataclass.py
rename to lib/dnspython/dns/rdataclass.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdataset.py b/lib/dnspython/dns/rdataset.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdataset.py
rename to lib/dnspython/dns/rdataset.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdatatype.py b/lib/dnspython/dns/rdatatype.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdatatype.py
rename to lib/dnspython/dns/rdatatype.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/AFSDB.py b/lib/dnspython/dns/rdtypes/ANY/AFSDB.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/AFSDB.py
rename to lib/dnspython/dns/rdtypes/ANY/AFSDB.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/CERT.py b/lib/dnspython/dns/rdtypes/ANY/CERT.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/CERT.py
rename to lib/dnspython/dns/rdtypes/ANY/CERT.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/CNAME.py b/lib/dnspython/dns/rdtypes/ANY/CNAME.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/CNAME.py
rename to lib/dnspython/dns/rdtypes/ANY/CNAME.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DLV.py b/lib/dnspython/dns/rdtypes/ANY/DLV.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DLV.py
rename to lib/dnspython/dns/rdtypes/ANY/DLV.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DNAME.py b/lib/dnspython/dns/rdtypes/ANY/DNAME.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DNAME.py
rename to lib/dnspython/dns/rdtypes/ANY/DNAME.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DNSKEY.py b/lib/dnspython/dns/rdtypes/ANY/DNSKEY.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DNSKEY.py
rename to lib/dnspython/dns/rdtypes/ANY/DNSKEY.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DS.py b/lib/dnspython/dns/rdtypes/ANY/DS.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DS.py
rename to lib/dnspython/dns/rdtypes/ANY/DS.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/GPOS.py b/lib/dnspython/dns/rdtypes/ANY/GPOS.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/GPOS.py
rename to lib/dnspython/dns/rdtypes/ANY/GPOS.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/HINFO.py b/lib/dnspython/dns/rdtypes/ANY/HINFO.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/HINFO.py
rename to lib/dnspython/dns/rdtypes/ANY/HINFO.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/HIP.py b/lib/dnspython/dns/rdtypes/ANY/HIP.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/HIP.py
rename to lib/dnspython/dns/rdtypes/ANY/HIP.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/ISDN.py b/lib/dnspython/dns/rdtypes/ANY/ISDN.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/ISDN.py
rename to lib/dnspython/dns/rdtypes/ANY/ISDN.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/KEY.py b/lib/dnspython/dns/rdtypes/ANY/KEY.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/KEY.py
rename to lib/dnspython/dns/rdtypes/ANY/KEY.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/LOC.py b/lib/dnspython/dns/rdtypes/ANY/LOC.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/LOC.py
rename to lib/dnspython/dns/rdtypes/ANY/LOC.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/MX.py b/lib/dnspython/dns/rdtypes/ANY/MX.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/MX.py
rename to lib/dnspython/dns/rdtypes/ANY/MX.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NS.py b/lib/dnspython/dns/rdtypes/ANY/NS.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NS.py
rename to lib/dnspython/dns/rdtypes/ANY/NS.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NSEC.py b/lib/dnspython/dns/rdtypes/ANY/NSEC.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NSEC.py
rename to lib/dnspython/dns/rdtypes/ANY/NSEC.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NSEC3.py b/lib/dnspython/dns/rdtypes/ANY/NSEC3.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NSEC3.py
rename to lib/dnspython/dns/rdtypes/ANY/NSEC3.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NSEC3PARAM.py b/lib/dnspython/dns/rdtypes/ANY/NSEC3PARAM.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NSEC3PARAM.py
rename to lib/dnspython/dns/rdtypes/ANY/NSEC3PARAM.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NXT.py b/lib/dnspython/dns/rdtypes/ANY/NXT.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NXT.py
rename to lib/dnspython/dns/rdtypes/ANY/NXT.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/PTR.py b/lib/dnspython/dns/rdtypes/ANY/PTR.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/PTR.py
rename to lib/dnspython/dns/rdtypes/ANY/PTR.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/RP.py b/lib/dnspython/dns/rdtypes/ANY/RP.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/RP.py
rename to lib/dnspython/dns/rdtypes/ANY/RP.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/RRSIG.py b/lib/dnspython/dns/rdtypes/ANY/RRSIG.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/RRSIG.py
rename to lib/dnspython/dns/rdtypes/ANY/RRSIG.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/RT.py b/lib/dnspython/dns/rdtypes/ANY/RT.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/RT.py
rename to lib/dnspython/dns/rdtypes/ANY/RT.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SIG.py b/lib/dnspython/dns/rdtypes/ANY/SIG.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SIG.py
rename to lib/dnspython/dns/rdtypes/ANY/SIG.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SOA.py b/lib/dnspython/dns/rdtypes/ANY/SOA.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SOA.py
rename to lib/dnspython/dns/rdtypes/ANY/SOA.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SPF.py b/lib/dnspython/dns/rdtypes/ANY/SPF.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SPF.py
rename to lib/dnspython/dns/rdtypes/ANY/SPF.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SSHFP.py b/lib/dnspython/dns/rdtypes/ANY/SSHFP.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SSHFP.py
rename to lib/dnspython/dns/rdtypes/ANY/SSHFP.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/TXT.py b/lib/dnspython/dns/rdtypes/ANY/TXT.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/TXT.py
rename to lib/dnspython/dns/rdtypes/ANY/TXT.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/X25.py b/lib/dnspython/dns/rdtypes/ANY/X25.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/X25.py
rename to lib/dnspython/dns/rdtypes/ANY/X25.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/__init__.py b/lib/dnspython/dns/rdtypes/ANY/__init__.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/__init__.py
rename to lib/dnspython/dns/rdtypes/ANY/__init__.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/A.py b/lib/dnspython/dns/rdtypes/IN/A.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/A.py
rename to lib/dnspython/dns/rdtypes/IN/A.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/AAAA.py b/lib/dnspython/dns/rdtypes/IN/AAAA.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/AAAA.py
rename to lib/dnspython/dns/rdtypes/IN/AAAA.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/APL.py b/lib/dnspython/dns/rdtypes/IN/APL.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/APL.py
rename to lib/dnspython/dns/rdtypes/IN/APL.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/DHCID.py b/lib/dnspython/dns/rdtypes/IN/DHCID.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/DHCID.py
rename to lib/dnspython/dns/rdtypes/IN/DHCID.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/IPSECKEY.py b/lib/dnspython/dns/rdtypes/IN/IPSECKEY.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/IPSECKEY.py
rename to lib/dnspython/dns/rdtypes/IN/IPSECKEY.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/KX.py b/lib/dnspython/dns/rdtypes/IN/KX.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/KX.py
rename to lib/dnspython/dns/rdtypes/IN/KX.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/NAPTR.py b/lib/dnspython/dns/rdtypes/IN/NAPTR.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/NAPTR.py
rename to lib/dnspython/dns/rdtypes/IN/NAPTR.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/NSAP.py b/lib/dnspython/dns/rdtypes/IN/NSAP.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/NSAP.py
rename to lib/dnspython/dns/rdtypes/IN/NSAP.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/NSAP_PTR.py b/lib/dnspython/dns/rdtypes/IN/NSAP_PTR.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/NSAP_PTR.py
rename to lib/dnspython/dns/rdtypes/IN/NSAP_PTR.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/PX.py b/lib/dnspython/dns/rdtypes/IN/PX.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/PX.py
rename to lib/dnspython/dns/rdtypes/IN/PX.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/SRV.py b/lib/dnspython/dns/rdtypes/IN/SRV.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/SRV.py
rename to lib/dnspython/dns/rdtypes/IN/SRV.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/WKS.py b/lib/dnspython/dns/rdtypes/IN/WKS.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/WKS.py
rename to lib/dnspython/dns/rdtypes/IN/WKS.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/__init__.py b/lib/dnspython/dns/rdtypes/IN/__init__.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/__init__.py
rename to lib/dnspython/dns/rdtypes/IN/__init__.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/__init__.py b/lib/dnspython/dns/rdtypes/__init__.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/__init__.py
rename to lib/dnspython/dns/rdtypes/__init__.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/dsbase.py b/lib/dnspython/dns/rdtypes/dsbase.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/dsbase.py
rename to lib/dnspython/dns/rdtypes/dsbase.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/keybase.py b/lib/dnspython/dns/rdtypes/keybase.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/keybase.py
rename to lib/dnspython/dns/rdtypes/keybase.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/mxbase.py b/lib/dnspython/dns/rdtypes/mxbase.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/mxbase.py
rename to lib/dnspython/dns/rdtypes/mxbase.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/nsbase.py b/lib/dnspython/dns/rdtypes/nsbase.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/nsbase.py
rename to lib/dnspython/dns/rdtypes/nsbase.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/sigbase.py b/lib/dnspython/dns/rdtypes/sigbase.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/sigbase.py
rename to lib/dnspython/dns/rdtypes/sigbase.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/txtbase.py b/lib/dnspython/dns/rdtypes/txtbase.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rdtypes/txtbase.py
rename to lib/dnspython/dns/rdtypes/txtbase.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/renderer.py b/lib/dnspython/dns/renderer.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/renderer.py
rename to lib/dnspython/dns/renderer.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/resolver.py b/lib/dnspython/dns/resolver.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/resolver.py
rename to lib/dnspython/dns/resolver.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/reversename.py b/lib/dnspython/dns/reversename.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/reversename.py
rename to lib/dnspython/dns/reversename.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rrset.py b/lib/dnspython/dns/rrset.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/rrset.py
rename to lib/dnspython/dns/rrset.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/set.py b/lib/dnspython/dns/set.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/set.py
rename to lib/dnspython/dns/set.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/tokenizer.py b/lib/dnspython/dns/tokenizer.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/tokenizer.py
rename to lib/dnspython/dns/tokenizer.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/tsig.py b/lib/dnspython/dns/tsig.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/tsig.py
rename to lib/dnspython/dns/tsig.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/tsigkeyring.py b/lib/dnspython/dns/tsigkeyring.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/tsigkeyring.py
rename to lib/dnspython/dns/tsigkeyring.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/ttl.py b/lib/dnspython/dns/ttl.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/ttl.py
rename to lib/dnspython/dns/ttl.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/update.py b/lib/dnspython/dns/update.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/update.py
rename to lib/dnspython/dns/update.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/version.py b/lib/dnspython/dns/version.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/version.py
rename to lib/dnspython/dns/version.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/zone.py b/lib/dnspython/dns/zone.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/dns/zone.py
rename to lib/dnspython/dns/zone.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/ddns.py b/lib/dnspython/examples/ddns.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/examples/ddns.py
rename to lib/dnspython/examples/ddns.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/e164.py b/lib/dnspython/examples/e164.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/examples/e164.py
rename to lib/dnspython/examples/e164.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/mx.py b/lib/dnspython/examples/mx.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/examples/mx.py
rename to lib/dnspython/examples/mx.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/name.py b/lib/dnspython/examples/name.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/examples/name.py
rename to lib/dnspython/examples/name.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/reverse.py b/lib/dnspython/examples/reverse.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/examples/reverse.py
rename to lib/dnspython/examples/reverse.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/reverse_name.py b/lib/dnspython/examples/reverse_name.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/examples/reverse_name.py
rename to lib/dnspython/examples/reverse_name.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/xfr.py b/lib/dnspython/examples/xfr.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/examples/xfr.py
rename to lib/dnspython/examples/xfr.py
diff --git a/source4/scripting/python/samba_external/dnspython/setup.py b/lib/dnspython/setup.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/setup.py
rename to lib/dnspython/setup.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/Makefile b/lib/dnspython/tests/Makefile
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/Makefile
rename to lib/dnspython/tests/Makefile
diff --git a/source4/scripting/python/samba_external/dnspython/tests/bugs.py b/lib/dnspython/tests/bugs.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/bugs.py
rename to lib/dnspython/tests/bugs.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/example b/lib/dnspython/tests/example
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/example
rename to lib/dnspython/tests/example
diff --git a/source4/scripting/python/samba_external/dnspython/tests/example1.good b/lib/dnspython/tests/example1.good
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/example1.good
rename to lib/dnspython/tests/example1.good
diff --git a/source4/scripting/python/samba_external/dnspython/tests/example2.good b/lib/dnspython/tests/example2.good
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/example2.good
rename to lib/dnspython/tests/example2.good
diff --git a/source4/scripting/python/samba_external/dnspython/tests/flags.py b/lib/dnspython/tests/flags.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/flags.py
rename to lib/dnspython/tests/flags.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/message.py b/lib/dnspython/tests/message.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/message.py
rename to lib/dnspython/tests/message.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/name.py b/lib/dnspython/tests/name.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/name.py
rename to lib/dnspython/tests/name.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/namedict.py b/lib/dnspython/tests/namedict.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/namedict.py
rename to lib/dnspython/tests/namedict.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/ntoaaton.py b/lib/dnspython/tests/ntoaaton.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/ntoaaton.py
rename to lib/dnspython/tests/ntoaaton.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/rdtypeandclass.py b/lib/dnspython/tests/rdtypeandclass.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/rdtypeandclass.py
rename to lib/dnspython/tests/rdtypeandclass.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/resolver.py b/lib/dnspython/tests/resolver.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/resolver.py
rename to lib/dnspython/tests/resolver.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/rrset.py b/lib/dnspython/tests/rrset.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/rrset.py
rename to lib/dnspython/tests/rrset.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/set.py b/lib/dnspython/tests/set.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/set.py
rename to lib/dnspython/tests/set.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/tokenizer.py b/lib/dnspython/tests/tokenizer.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/tokenizer.py
rename to lib/dnspython/tests/tokenizer.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/update.py b/lib/dnspython/tests/update.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/update.py
rename to lib/dnspython/tests/update.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/zone.py b/lib/dnspython/tests/zone.py
similarity index 100%
rename from source4/scripting/python/samba_external/dnspython/tests/zone.py
rename to lib/dnspython/tests/zone.py
diff --git a/lib/subunit/python/subunit/run.py b/lib/subunit/python/subunit/run.py
index e57939f..01c0b0e 100755
--- a/lib/subunit/python/subunit/run.py
+++ b/lib/subunit/python/subunit/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
#
# Simple subunit testrunner for python
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/lib/subunit/python/subunit/test_results.py b/lib/subunit/python/subunit/test_results.py
index 4ccc2aa..6cf84c5 100644
--- a/lib/subunit/python/subunit/test_results.py
+++ b/lib/subunit/python/subunit/test_results.py
@@ -83,8 +83,8 @@ class TestResultDecorator(object):
def stop(self):
return self.decorated.stop()
- def tags(self, gone_tags, new_tags):
- return self.decorated.time(gone_tags, new_tags)
+ def tags(self, new_tags, gone_tags):
+ return self.decorated.time(new_tags, gone_tags)
def time(self, a_datetime):
return self.decorated.time(a_datetime)
diff --git a/lib/subunit/python/testtools/matchers.py b/lib/subunit/python/testtools/matchers.py
index 244dace..039c84b 100644
--- a/lib/subunit/python/testtools/matchers.py
+++ b/lib/subunit/python/testtools/matchers.py
--
Samba Shared Repository
More information about the samba-cvs
mailing list