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.

116 files changed, 8 insertions, 29 deletions

diff --git a/source4/scripting/python/samba_external/dnspython/ChangeLog b/lib/dnspython/ChangeLog
index f5a74da2b4..f5a74da2b4 100644
--- a/source4/scripting/python/samba_external/dnspython/ChangeLog
+++ b/lib/dnspython/ChangeLog
diff --git a/source4/scripting/python/samba_external/dnspython/LICENSE b/lib/dnspython/LICENSE
index 633c18c1e7..633c18c1e7 100644
--- a/source4/scripting/python/samba_external/dnspython/LICENSE
+++ b/lib/dnspython/LICENSE
diff --git a/source4/scripting/python/samba_external/dnspython/PKG-INFO b/lib/dnspython/PKG-INFO
index 455915df36..455915df36 100644
--- a/source4/scripting/python/samba_external/dnspython/PKG-INFO
+++ b/lib/dnspython/PKG-INFO
diff --git a/source4/scripting/python/samba_external/dnspython/README b/lib/dnspython/README
index 0e5793ace0..0e5793ace0 100644
--- a/source4/scripting/python/samba_external/dnspython/README
+++ b/lib/dnspython/README
diff --git a/source4/scripting/python/samba_external/dnspython/TODO b/lib/dnspython/TODO
index 59ce1be1ce..59ce1be1ce 100644
--- a/source4/scripting/python/samba_external/dnspython/TODO
+++ b/lib/dnspython/TODO
diff --git a/source4/scripting/python/samba_external/dnspython/dns/__init__.py b/lib/dnspython/dns/__init__.py
index 5ad5737cfa..5ad5737cfa 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/__init__.py
+++ b/lib/dnspython/dns/__init__.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/dnssec.py b/lib/dnspython/dns/dnssec.py
index acf46535b9..acf46535b9 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/dnssec.py
+++ b/lib/dnspython/dns/dnssec.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/e164.py b/lib/dnspython/dns/e164.py
index d8f71ec799..d8f71ec799 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/e164.py
+++ b/lib/dnspython/dns/e164.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/edns.py b/lib/dnspython/dns/edns.py
index 1731cedde4..1731cedde4 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/edns.py
+++ b/lib/dnspython/dns/edns.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/entropy.py b/lib/dnspython/dns/entropy.py
index fd9d4f8cdf..fd9d4f8cdf 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/entropy.py
+++ b/lib/dnspython/dns/entropy.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/exception.py b/lib/dnspython/dns/exception.py
index c6d6570d98..c6d6570d98 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/exception.py
+++ b/lib/dnspython/dns/exception.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/flags.py b/lib/dnspython/dns/flags.py
index 79375ea2ce..79375ea2ce 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/flags.py
+++ b/lib/dnspython/dns/flags.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/inet.py b/lib/dnspython/dns/inet.py
index 993a2f9436..993a2f9436 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/inet.py
+++ b/lib/dnspython/dns/inet.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/ipv4.py b/lib/dnspython/dns/ipv4.py
index 1569da5475..1569da5475 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/ipv4.py
+++ b/lib/dnspython/dns/ipv4.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/ipv6.py b/lib/dnspython/dns/ipv6.py
index 33c6713796..33c6713796 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/ipv6.py
+++ b/lib/dnspython/dns/ipv6.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/message.py b/lib/dnspython/dns/message.py
index ba0ebf65f1..ba0ebf65f1 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/message.py
+++ b/lib/dnspython/dns/message.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/name.py b/lib/dnspython/dns/name.py
index f239c9b5de..f239c9b5de 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/name.py
+++ b/lib/dnspython/dns/name.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/namedict.py b/lib/dnspython/dns/namedict.py
index 54afb77188..54afb77188 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/namedict.py
+++ b/lib/dnspython/dns/namedict.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/node.py b/lib/dnspython/dns/node.py
index 785a245464..785a245464 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/node.py
+++ b/lib/dnspython/dns/node.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/opcode.py b/lib/dnspython/dns/opcode.py
index 735d3a1f7d..735d3a1f7d 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/opcode.py
+++ b/lib/dnspython/dns/opcode.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/query.py b/lib/dnspython/dns/query.py
index c023b140af..c023b140af 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/query.py
+++ b/lib/dnspython/dns/query.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rcode.py b/lib/dnspython/dns/rcode.py
index c055f2e7cd..c055f2e7cd 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rcode.py
+++ b/lib/dnspython/dns/rcode.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdata.py b/lib/dnspython/dns/rdata.py
index ce0268697b..ce0268697b 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdata.py
+++ b/lib/dnspython/dns/rdata.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdataclass.py b/lib/dnspython/dns/rdataclass.py
index 887fd1ad6b..887fd1ad6b 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdataclass.py
+++ b/lib/dnspython/dns/rdataclass.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdataset.py b/lib/dnspython/dns/rdataset.py
index 0af018bab5..0af018bab5 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdataset.py
+++ b/lib/dnspython/dns/rdataset.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rdatatype.py b/lib/dnspython/dns/rdatatype.py
index 1a02b7d3cd..1a02b7d3cd 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdatatype.py
+++ b/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
index e8ca6f5cbb..e8ca6f5cbb 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/AFSDB.py
+++ b/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
index d2703519d5..d2703519d5 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/CERT.py
+++ b/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
index 7f5c4b3bd7..7f5c4b3bd7 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/CNAME.py
+++ b/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
index 07b9548342..07b9548342 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DLV.py
+++ b/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
index 99b5013f33..99b5013f33 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DNAME.py
+++ b/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
index ad66ef0c69..ad66ef0c69 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DNSKEY.py
+++ b/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
index 3a06f448f7..3a06f448f7 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/DS.py
+++ b/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
index aa8000f8ca..aa8000f8ca 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/GPOS.py
+++ b/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
index 5cfef5a932..5cfef5a932 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/HINFO.py
+++ b/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
index 8f96ae93d6..8f96ae93d6 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/HIP.py
+++ b/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
index 424d3a9a3c..424d3a9a3c 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/ISDN.py
+++ b/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
index c8581edbeb..c8581edbeb 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/KEY.py
+++ b/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
index 518dd6010f..518dd6010f 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/LOC.py
+++ b/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
index 9cad260672..9cad260672 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/MX.py
+++ b/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
index 4b03a3ab47..4b03a3ab47 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NS.py
+++ b/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
index 72859ce108..72859ce108 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NSEC.py
+++ b/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
index 932d7b4032..932d7b4032 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NSEC3.py
+++ b/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
index ec91e5e85c..ec91e5e85c 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NSEC3PARAM.py
+++ b/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
index 99ae9b9dff..99ae9b9dff 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/NXT.py
+++ b/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
index 6c4b79eaac..6c4b79eaac 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/PTR.py
+++ b/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
index 421ce8e207..421ce8e207 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/RP.py
+++ b/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
index 0e4816f648..0e4816f648 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/RRSIG.py
+++ b/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
index 1efd3724d9..1efd3724d9 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/RT.py
+++ b/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
index 501e29cc8c..501e29cc8c 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SIG.py
+++ b/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
index 5f74b8d384..5f74b8d384 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SOA.py
+++ b/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
index 9b5a9a9fed..9b5a9a9fed 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SPF.py
+++ b/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
index bc54f5e260..bc54f5e260 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/SSHFP.py
+++ b/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
index 23f4f3b7c6..23f4f3b7c6 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/TXT.py
+++ b/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
index fc4790fe8a..fc4790fe8a 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/X25.py
+++ b/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
index 0815dd5450..0815dd5450 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/ANY/__init__.py
+++ b/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
index e05f204a2f..e05f204a2f 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/A.py
+++ b/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
index 2d812d39eb..2d812d39eb 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/AAAA.py
+++ b/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
index 7412c02d30..7412c02d30 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/APL.py
+++ b/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
index 2d35234bf0..2d35234bf0 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/DHCID.py
+++ b/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
index 9ab08d881c..9ab08d881c 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/IPSECKEY.py
+++ b/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
index 4d8a3a7d6b..4d8a3a7d6b 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/KX.py
+++ b/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
index 3a30d16d7b..3a30d16d7b 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/NAPTR.py
+++ b/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
index 22b9131ccf..22b9131ccf 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/NSAP.py
+++ b/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
index 6f591f4ec0..6f591f4ec0 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/NSAP_PTR.py
+++ b/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
index 4718944ff4..4718944ff4 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/PX.py
+++ b/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
index c9c5823381..c9c5823381 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/SRV.py
+++ b/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
index 85aafb3d23..85aafb3d23 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/WKS.py
+++ b/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
index ab931296ec..ab931296ec 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/IN/__init__.py
+++ b/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
index 13282be73a..13282be73a 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/__init__.py
+++ b/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
index aa46403a5f..aa46403a5f 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/dsbase.py
+++ b/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
index 75c9272670..75c9272670 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/keybase.py
+++ b/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
index 5e3515bec4..5e3515bec4 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/mxbase.py
+++ b/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
index 7cdb2a0289..7cdb2a0289 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/nsbase.py
+++ b/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
index ccb6dd69ae..ccb6dd69ae 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/sigbase.py
+++ b/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
index 43db2a48c0..43db2a48c0 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rdtypes/txtbase.py
+++ b/lib/dnspython/dns/rdtypes/txtbase.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/renderer.py b/lib/dnspython/dns/renderer.py
index bb0218ac30..bb0218ac30 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/renderer.py
+++ b/lib/dnspython/dns/renderer.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/resolver.py b/lib/dnspython/dns/resolver.py
index 372d7d8361..372d7d8361 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/resolver.py
+++ b/lib/dnspython/dns/resolver.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/reversename.py b/lib/dnspython/dns/reversename.py
index 0a61b827b0..0a61b827b0 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/reversename.py
+++ b/lib/dnspython/dns/reversename.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/rrset.py b/lib/dnspython/dns/rrset.py
index 7f6c4afed4..7f6c4afed4 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/rrset.py
+++ b/lib/dnspython/dns/rrset.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/set.py b/lib/dnspython/dns/set.py
index 91f9fb8766..91f9fb8766 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/set.py
+++ b/lib/dnspython/dns/set.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/tokenizer.py b/lib/dnspython/dns/tokenizer.py
index 4f68a2a495..4f68a2a495 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/tokenizer.py
+++ b/lib/dnspython/dns/tokenizer.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/tsig.py b/lib/dnspython/dns/tsig.py
index b4deeca859..b4deeca859 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/tsig.py
+++ b/lib/dnspython/dns/tsig.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/tsigkeyring.py b/lib/dnspython/dns/tsigkeyring.py
index 4d68f96c85..4d68f96c85 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/tsigkeyring.py
+++ b/lib/dnspython/dns/tsigkeyring.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/ttl.py b/lib/dnspython/dns/ttl.py
index f295300517..f295300517 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/ttl.py
+++ b/lib/dnspython/dns/ttl.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/update.py b/lib/dnspython/dns/update.py
index 7d42636891..7d42636891 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/update.py
+++ b/lib/dnspython/dns/update.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/version.py b/lib/dnspython/dns/version.py
index 7a36775180..7a36775180 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/version.py
+++ b/lib/dnspython/dns/version.py
diff --git a/source4/scripting/python/samba_external/dnspython/dns/zone.py b/lib/dnspython/dns/zone.py
index 93c157d8f0..93c157d8f0 100644
--- a/source4/scripting/python/samba_external/dnspython/dns/zone.py
+++ b/lib/dnspython/dns/zone.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/ddns.py b/lib/dnspython/examples/ddns.py
index 84814b73cf..84814b73cf 100755
--- a/source4/scripting/python/samba_external/dnspython/examples/ddns.py
+++ b/lib/dnspython/examples/ddns.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/e164.py b/lib/dnspython/examples/e164.py
index ad40ccf84b..ad40ccf84b 100755
--- a/source4/scripting/python/samba_external/dnspython/examples/e164.py
+++ b/lib/dnspython/examples/e164.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/mx.py b/lib/dnspython/examples/mx.py
index 3036e70ddf..3036e70ddf 100755
--- a/source4/scripting/python/samba_external/dnspython/examples/mx.py
+++ b/lib/dnspython/examples/mx.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/name.py b/lib/dnspython/examples/name.py
index b099c49d16..b099c49d16 100755
--- a/source4/scripting/python/samba_external/dnspython/examples/name.py
+++ b/lib/dnspython/examples/name.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/reverse.py b/lib/dnspython/examples/reverse.py
index 8657baed44..8657baed44 100755
--- a/source4/scripting/python/samba_external/dnspython/examples/reverse.py
+++ b/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
index 351896b015..351896b015 100755
--- a/source4/scripting/python/samba_external/dnspython/examples/reverse_name.py
+++ b/lib/dnspython/examples/reverse_name.py
diff --git a/source4/scripting/python/samba_external/dnspython/examples/xfr.py b/lib/dnspython/examples/xfr.py
index 5cd6f55c06..5cd6f55c06 100755
--- a/source4/scripting/python/samba_external/dnspython/examples/xfr.py
+++ b/lib/dnspython/examples/xfr.py
diff --git a/source4/scripting/python/samba_external/dnspython/setup.py b/lib/dnspython/setup.py
index 12fd2f1dc6..12fd2f1dc6 100755
--- a/source4/scripting/python/samba_external/dnspython/setup.py
+++ b/lib/dnspython/setup.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/Makefile b/lib/dnspython/tests/Makefile
index 584f6a7da7..584f6a7da7 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/Makefile
+++ b/lib/dnspython/tests/Makefile
diff --git a/source4/scripting/python/samba_external/dnspython/tests/bugs.py b/lib/dnspython/tests/bugs.py
index 0896e3f02d..0896e3f02d 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/bugs.py
+++ b/lib/dnspython/tests/bugs.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/example b/lib/dnspython/tests/example
index d87c63a393..d87c63a393 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/example
+++ b/lib/dnspython/tests/example
diff --git a/source4/scripting/python/samba_external/dnspython/tests/example1.good b/lib/dnspython/tests/example1.good
index ca5ead6379..ca5ead6379 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/example1.good
+++ b/lib/dnspython/tests/example1.good
diff --git a/source4/scripting/python/samba_external/dnspython/tests/example2.good b/lib/dnspython/tests/example2.good
index c923c09b7c..c923c09b7c 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/example2.good
+++ b/lib/dnspython/tests/example2.good
diff --git a/source4/scripting/python/samba_external/dnspython/tests/flags.py b/lib/dnspython/tests/flags.py
index 7ee2d8e12e..7ee2d8e12e 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/flags.py
+++ b/lib/dnspython/tests/flags.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/message.py b/lib/dnspython/tests/message.py
index 7134661d3a..7134661d3a 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/message.py
+++ b/lib/dnspython/tests/message.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/name.py b/lib/dnspython/tests/name.py
index a53ef9eac6..a53ef9eac6 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/name.py
+++ b/lib/dnspython/tests/name.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/namedict.py b/lib/dnspython/tests/namedict.py
index 0261142186..0261142186 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/namedict.py
+++ b/lib/dnspython/tests/namedict.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/ntoaaton.py b/lib/dnspython/tests/ntoaaton.py
index 77befd26e3..77befd26e3 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/ntoaaton.py
+++ b/lib/dnspython/tests/ntoaaton.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/rdtypeandclass.py b/lib/dnspython/tests/rdtypeandclass.py
index edd7f7eae3..edd7f7eae3 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/rdtypeandclass.py
+++ b/lib/dnspython/tests/rdtypeandclass.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/resolver.py b/lib/dnspython/tests/resolver.py
index 4cacbdc79d..4cacbdc79d 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/resolver.py
+++ b/lib/dnspython/tests/resolver.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/rrset.py b/lib/dnspython/tests/rrset.py
index 740162b4c5..740162b4c5 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/rrset.py
+++ b/lib/dnspython/tests/rrset.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/set.py b/lib/dnspython/tests/set.py
index 6319eb821c..6319eb821c 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/set.py
+++ b/lib/dnspython/tests/set.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/tokenizer.py b/lib/dnspython/tests/tokenizer.py
index 4f4a1bdc90..4f4a1bdc90 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/tokenizer.py
+++ b/lib/dnspython/tests/tokenizer.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/update.py b/lib/dnspython/tests/update.py
index 5f7b31f23f..5f7b31f23f 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/update.py
+++ b/lib/dnspython/tests/update.py
diff --git a/source4/scripting/python/samba_external/dnspython/tests/zone.py b/lib/dnspython/tests/zone.py
index a8d629c532..a8d629c532 100644
--- a/source4/scripting/python/samba_external/dnspython/tests/zone.py
+++ b/lib/dnspython/tests/zone.py
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index 4d54ab4f4c..fab112e2bd 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -18,7 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import getopt
 import os
 import fcntl
 import sys
@@ -33,15 +32,14 @@ sys.path.insert(0, "bin/python")
 
 import samba
 import optparse
-from samba import getopt as options, Ldb
-from ldb import SCOPE_SUBTREE, SCOPE_BASE, LdbError
-import ldb
+from samba import getopt as options
+from ldb import SCOPE_BASE
 from samba import glue
 from samba.auth import system_session
 from samba.samdb import SamDB
 import samba.external
 
-resolver = samba.external.samba_external_dns_resolver()
+resolver = samba.external.dns_resolver()
 
 default_ttl = 900
 
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index c1e1c5de82..0b495260bd 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -30,7 +30,7 @@ $(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubs
 EPYDOC_OPTIONS = --no-private --url http://www.samba.org/ --no-sourcecode
 
 epydoc:: pythonmods
-	PYTHONPATH=$(pythonbuilddir):../lib/subunit/python epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit testtools
+	PYTHONPATH=$(pythonbuilddir):../lib/subunit/python epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit testtools dnspython
 
 install:: installpython
 
diff --git a/source4/scripting/python/samba/external.py b/source4/scripting/python/samba/external.py
index eca910b794..40d13fd7e5 100644
--- a/source4/scripting/python/samba/external.py
+++ b/source4/scripting/python/samba/external.py
@@ -17,34 +17,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import sys, os
+import os, sys
 
-def samba_find_external(directory):
-    '''insert into out module search path the path to an
-       external library'''
-    for p in sys.path:
-        dir = os.path.join(p, directory)
-        if os.path.isdir(dir):
-            sys.path.insert(0, dir)
-            return
-
-    # finally try in the local directory, to handle in-tree testing
-    dir = os.path.join("scripting/python", directory)
-    if os.path.isdir(dir):
-        sys.path.insert(0, dir)
-        return
-
-    print "Failed to find external python library %s" % directory
-    raise
-
-
-def samba_external_dns_resolver():
+def dns_resolver():
     '''try and import the dns.resolver library, and if it fails
     then use a local copy from the external directory'''
 
     try:
         import dns.resolver as dns
-    except:
-        samba_find_external("samba_external/dnspython")
+    except ImportError:
+        sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../../../lib/dnspython"))
         import dns.resolver as dns
     return dns