From 923010d99bd79c36b8d6dbedef4228df4d6fa1b4 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Thu, 6 Dec 2018 09:56:07 +0000 Subject: [PATCH] various: Remove references to about to be deleted thirdparty/dnspython Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- lib/README | 1 - python/samba/emulate/traffic_packets.py | 1 - source4/scripting/bin/samba_dnsupdate | 1 - source4/scripting/bin/samba_upgradedns | 1 - third_party/update.sh | 5 ----- third_party/wscript | 1 - 6 files changed, 10 deletions(-) diff --git a/lib/README b/lib/README index 24e9fac5c66..c3e11173b7c 100644 --- 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 2628727e65b..518bffac390 100644 --- 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 db63cd24afe..5df8d608bfb 100755 --- 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 bfd22c81f29..4f462b9fa32 100755 --- 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 5248d95f3a6..a510e8a7042 100755 --- 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 f7a6daff0dd..ecd1975d7b8 100644 --- 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", }