various: Remove references to about to be deleted thirdparty/dnspython

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/README b/lib/README
index 24e9fac5c66abae52999262b05740708d72fc76d..c3e11173b7ca2d3341bf3b289e6b7cac741d1d3a 100644 (file)
--- a/lib/README
+++ b/lib/README
@@ -1,5 +1,4 @@
 compression - Various compression algorithms (MSZIP, lzxpress)
-dnspython - Python module for working with DNS.
 popt - Command-line option parsing library
 replace - Provides replacements for standard (POSIX, C99) functions 
           not provided by the host platform.

diff --git a/python/samba/emulate/traffic_packets.py b/python/samba/emulate/traffic_packets.py
index 2628727e65beeffb58f7ec7659bed7d8a331d3e0..518bffac390581864ce46b6a00bc1193e42bbc67 100644 (file)
--- a/python/samba/emulate/traffic_packets.py
+++ b/python/samba/emulate/traffic_packets.py
@@ -36,7 +36,6 @@ from samba.ntstatus import (
     NT_STATUS_NO_SUCH_DOMAIN
 )
 import samba
-samba.ensure_third_party_module("dns", "dnspython")
 import dns.resolver
 
 

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index db63cd24afea72c9726e47a0fc9aa08069e10ea5..5df8d608bfb159283963dfdad2c3ed18d79a8e84 100755 (executable)
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -53,7 +53,6 @@ from samba.compat import get_string
 from samba.compat import text_type
 import ldb
 
-samba.ensure_third_party_module("dns", "dnspython")
 import dns.resolver
 import dns.exception
 

diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index bfd22c81f29188a6af715e59391663e656ca4e0f..4f462b9fa320c6594f72e3c4b5ff37f7befa23ee 100755 (executable)
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -68,7 +68,6 @@ from samba.provision.sambadns import (
     create_named_txt )
 from samba.dcerpc import security
 
-samba.ensure_third_party_module("dns", "dnspython")
 import dns.zone, dns.rdatatype
 
 __docformat__ = 'restructuredText'

diff --git a/third_party/update.sh b/third_party/update.sh
index 5248d95f3a604512e4fe8f7d6f5578bb8e34f56b..a510e8a70426e0b2f154011af9f481d10b7aa901 100755 (executable)
--- a/third_party/update.sh
+++ b/third_party/update.sh
@@ -8,11 +8,6 @@ THIRD_PARTY_DIR="`dirname $0`"
 # $THIRD_PARTY_DIR yet.
 WORKDIR="`mktemp -d`"
 
-echo "Updating dnspython..."
-git clone git://git.samba.org/third_party/dnspython "$WORKDIR/dnspython"
-rm -rf "$WORKDIR/dnspython/.git"
-rsync -avz --delete "$WORKDIR/dnspython/" "$THIRD_PARTY_DIR/dnspython/"
-
 echo "Updating pep8..."
 git clone git://git.samba.org/third_party/pep8 "$WORKDIR/pep8"
 rm -rf "$WORKDIR/pep8/.git"

diff --git a/third_party/wscript b/third_party/wscript
index f7a6daff0dd2ca47cd4255101e0fd13c3ecc562e..ecd1975d7b897f7631d0d4c47837e4fae328f074 100644 (file)
--- a/third_party/wscript
+++ b/third_party/wscript
@@ -7,7 +7,6 @@ from waflib import Options, Errors
 
 # work out what python external libraries we need to install
 external_pkgs = {
-    "dns.resolver": "dnspython/dns",
     "iso8601": "pyiso8601/iso8601",
     }