From: Bob Halley Date: Mon, 31 Oct 2005 07:24:44 +0000 (+0000) Subject: fix stuff pyflakes found X-Git-Tag: v1.3.5~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a83615f439aec63f37198324260eac7f61f46d1c;p=thirdparty%2Fdnspython.git fix stuff pyflakes found --- diff --git a/dns/ipv6.py b/dns/ipv6.py index 5493e436..cca0068b 100644 --- a/dns/ipv6.py +++ b/dns/ipv6.py @@ -52,6 +52,7 @@ def inet_ntoa(address): # best_start = 0 best_len = 0 + start = -1 last_was_zero = False for i in xrange(8): if chunks[i] != '0': diff --git a/dns/message.py b/dns/message.py index 081540c7..335d4fe1 100644 --- a/dns/message.py +++ b/dns/message.py @@ -17,7 +17,6 @@ import cStringIO import random -import string import struct import sys import time diff --git a/dns/name.py b/dns/name.py index c5e4b9a0..09e2c6e6 100644 --- a/dns/name.py +++ b/dns/name.py @@ -25,7 +25,6 @@ import cStringIO import string import struct import sys -import types import dns.exception @@ -521,6 +520,8 @@ def from_text(text, origin = root): labels = [] label = '' escaping = False + edigits = 0 + total = 0 if text == '@': text = '' if text: diff --git a/dns/rdata.py b/dns/rdata.py index 9225b66c..b7ac81dd 100644 --- a/dns/rdata.py +++ b/dns/rdata.py @@ -25,9 +25,6 @@ default is 'dns.rdtypes'. Changing this value will break the library. chunk of hexstring that _hexify() produces before whitespace occurs. @type _hex_chunk: int""" -import codecs -import cStringIO - import dns.exception import dns.rdataclass import dns.rdatatype diff --git a/dns/rdataset.py b/dns/rdataset.py index 42052251..13a90686 100644 --- a/dns/rdataset.py +++ b/dns/rdataset.py @@ -18,7 +18,6 @@ import random import StringIO import struct -import sys import dns.exception import dns.rdatatype diff --git a/dns/rdtypes/ANY/LOC.py b/dns/rdtypes/ANY/LOC.py index 4ed5c46c..30db17a3 100644 --- a/dns/rdtypes/ANY/LOC.py +++ b/dns/rdtypes/ANY/LOC.py @@ -14,7 +14,6 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. import cStringIO -import math import struct import dns.exception diff --git a/dns/rdtypes/ANY/NSEC.py b/dns/rdtypes/ANY/NSEC.py index 8be2b469..8ecb3be9 100644 --- a/dns/rdtypes/ANY/NSEC.py +++ b/dns/rdtypes/ANY/NSEC.py @@ -14,7 +14,6 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. import cStringIO -import struct import dns.exception import dns.rdata diff --git a/dns/rdtypes/ANY/NXT.py b/dns/rdtypes/ANY/NXT.py index 95c9eec8..f9d26f4c 100644 --- a/dns/rdtypes/ANY/NXT.py +++ b/dns/rdtypes/ANY/NXT.py @@ -13,8 +13,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import struct - import dns.exception import dns.rdata import dns.rdatatype diff --git a/dns/rdtypes/ANY/RP.py b/dns/rdtypes/ANY/RP.py index 145decb2..819d6a9a 100644 --- a/dns/rdtypes/ANY/RP.py +++ b/dns/rdtypes/ANY/RP.py @@ -13,8 +13,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import struct - import dns.exception import dns.rdata import dns.name diff --git a/dns/rdtypes/ANY/TXT.py b/dns/rdtypes/ANY/TXT.py index 148b9f81..0aa5f2fa 100644 --- a/dns/rdtypes/ANY/TXT.py +++ b/dns/rdtypes/ANY/TXT.py @@ -13,8 +13,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import socket - import dns.exception import dns.rdata import dns.tokenizer diff --git a/dns/rdtypes/IN/A.py b/dns/rdtypes/IN/A.py index 3c0e51ee..3394a251 100644 --- a/dns/rdtypes/IN/A.py +++ b/dns/rdtypes/IN/A.py @@ -13,8 +13,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import socket - import dns.exception import dns.ipv4 import dns.rdata diff --git a/dns/rdtypes/IN/AAAA.py b/dns/rdtypes/IN/AAAA.py index 579ac799..ca9c063e 100644 --- a/dns/rdtypes/IN/AAAA.py +++ b/dns/rdtypes/IN/AAAA.py @@ -13,8 +13,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import socket - import dns.exception import dns.inet import dns.rdata diff --git a/dns/rdtypes/IN/APL.py b/dns/rdtypes/IN/APL.py index 72eab2cc..034cd347 100644 --- a/dns/rdtypes/IN/APL.py +++ b/dns/rdtypes/IN/APL.py @@ -14,7 +14,6 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. import cStringIO -import socket import struct import dns.exception diff --git a/dns/rdtypes/IN/NSAP.py b/dns/rdtypes/IN/NSAP.py index 7d638d1c..13655802 100644 --- a/dns/rdtypes/IN/NSAP.py +++ b/dns/rdtypes/IN/NSAP.py @@ -13,8 +13,6 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import socket - import dns.exception import dns.rdata import dns.tokenizer diff --git a/dns/rdtypes/nsbase.py b/dns/rdtypes/nsbase.py index d8f7f675..c5c9f441 100644 --- a/dns/rdtypes/nsbase.py +++ b/dns/rdtypes/nsbase.py @@ -15,8 +15,6 @@ """NS-like base classes.""" -import struct - import dns.exception import dns.rdata import dns.name diff --git a/dns/resolver.py b/dns/resolver.py index 11eca8cc..44032386 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -21,7 +21,6 @@ import socket import sys import time -import types import dns.exception import dns.message @@ -656,5 +655,5 @@ def zone_for_name(name, rdclass=dns.rdataclass.IN, tcp=False, resolver=None): except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): try: name = name.parent() - except NoParent: - raise NoRootSoa + except dns.name.NoParent: + raise NoRootSOA