diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | dns/edns.py | 4 | ||||
| -rw-r--r-- | dns/exception.py | 2 | ||||
| -rw-r--r-- | dns/message.py | 6 | ||||
| -rw-r--r-- | dns/name.py | 6 | ||||
| -rw-r--r-- | dns/rcode.py | 2 | ||||
| -rw-r--r-- | dns/rdata.py | 4 | ||||
| -rw-r--r-- | dns/renderer.py | 2 | ||||
| -rw-r--r-- | dns/zone.py | 4 | ||||
| -rwxr-xr-x | examples/zonediff.py | 2 | ||||
| -rw-r--r-- | tests/test_dnssec.py | 4 | ||||
| -rw-r--r-- | tests/test_zone.py | 2 |
13 files changed, 25 insertions, 25 deletions
@@ -44,7 +44,7 @@ * Comparing two rdata is now always done by comparing the binary data of the DNSSEC digestable forms. This corrects a number of - errors where dnspython's rdata comparsion order was not the + errors where dnspython's rdata comparison order was not the DNSSEC order. * Add CAA implementation. Thanks to Brian Wellington for the @@ -926,7 +926,7 @@ 2003-11-13 Bob Halley <halley@dnspython.org> * dns/rdtypes/ANY/LOC.py (LOC.to_wire): We encoded and decoded LOC - incorrectly, since we were interpreting the values of altitiude, + incorrectly, since we were interpreting the values of altitude, size, hprec, and vprec in meters instead of centimeters. * dns/rdtypes/IN/WKS.py (WKS.from_wire): The WKS protocol value is @@ -1210,7 +1210,7 @@ bar.foo 300 IN MX 0 blaz.foo - after the second step (relativiation to zone origin). + after the second step (relativization to zone origin). * dns/namedict.py: added. @@ -1231,7 +1231,7 @@ * dns/renderer.py: added new wire format rendering module and converted message.py to use it. Applications which want fine-grained control over the conversion to wire format may call - the renderer directy, instead of having it called on their behalf + the renderer directly, instead of having it called on their behalf by the message code. 2003-07-02 Bob Halley <halley@dnspython.org> @@ -156,7 +156,7 @@ New since 1.9.4: dns.resolver.query() will try TCP if a UDP response is truncated. - The python socket module's DNS methods can be now be overriden + The python socket module's DNS methods can be now be overridden with implementations that use dnspython's resolver. Old DNSSEC types KEY, NXT, and SIG have been removed. @@ -310,7 +310,7 @@ New since 1.7.0: Bugs fixed since 1.7.0: - The 1.7.0 kitting process inadventently omitted the code for the + The 1.7.0 kitting process inadvertently omitted the code for the DLV RR. Negative DDNS prerequisites are now handled correctly. diff --git a/dns/edns.py b/dns/edns.py index c6102fd..8ac676b 100644 --- a/dns/edns.py +++ b/dns/edns.py @@ -43,7 +43,7 @@ class Option(object): @type otype: int @param wire: The wire-format message @type wire: string - @param current: The offet in wire of the beginning of the rdata. + @param current: The offset in wire of the beginning of the rdata. @type current: int @param olen: The length of the wire-format option data @type olen: int @@ -140,7 +140,7 @@ def option_from_wire(otype, wire, current, olen): @type otype: int @param wire: The wire-format message @type wire: string - @param current: The offet in wire of the beginning of the rdata. + @param current: The offset in wire of the beginning of the rdata. @type current: int @param olen: The length of the wire-format option data @type olen: int diff --git a/dns/exception.py b/dns/exception.py index 799d53a..62fbe2c 100644 --- a/dns/exception.py +++ b/dns/exception.py @@ -34,7 +34,7 @@ class DNSException(Exception): In the new mode *args has to be empty and all kwargs has to exactly match set in class variable self.supp_kwargs. All kwargs are stored inside self.kwargs and used in new __str__ implementation to construct - formated message based on self.fmt string. + formatted message based on self.fmt string. In the simplest case it is enough to override supp_kwargs and fmt class variables to get nice parametrized messages. diff --git a/dns/message.py b/dns/message.py index 184100d..9b8dcd0 100644 --- a/dns/message.py +++ b/dns/message.py @@ -58,13 +58,13 @@ class UnknownHeaderField(dns.exception.DNSException): class BadEDNS(dns.exception.FormError): - """OPT record occured somewhere other than the start of + """OPT record occurred somewhere other than the start of the additional data section.""" class BadTSIG(dns.exception.FormError): - """A TSIG record occured somewhere other than the end of + """A TSIG record occurred somewhere other than the end of the additional data section.""" @@ -1050,7 +1050,7 @@ def make_query(qname, rdtype, rdclass=dns.rdataclass.IN, use_edns=None, The query name, type, and class may all be specified either as objects of the appropriate type, or as strings. - The query will have a randomly choosen query id, and its DNS flags + The query will have a randomly chosen query id, and its DNS flags will be set to dns.flags.RD. @param qname: The query name. diff --git a/dns/name.py b/dns/name.py index e5b0107..2a74694 100644 --- a/dns/name.py +++ b/dns/name.py @@ -226,7 +226,7 @@ class Name(object): def fullcompare(self, other): """Compare two names, returning a 3-tuple (relation, order, nlabels). - I{relation} describes the relation ship beween the names, + I{relation} describes the relation ship between the names, and is one of: dns.name.NAMERELN_NONE, dns.name.NAMERELN_SUPERDOMAIN, dns.name.NAMERELN_SUBDOMAIN, dns.name.NAMERELN_EQUAL, or dns.name.NAMERELN_COMMONANCESTOR @@ -379,7 +379,7 @@ class Name(object): def to_unicode(self, omit_final_dot=False): """Convert name to Unicode text format. - IDN ACE lables are converted to Unicode. + IDN ACE labels are converted to Unicode. @param omit_final_dot: If True, don't emit the final dot (denoting the root label) for absolute names. The default is False. @@ -587,7 +587,7 @@ empty = Name([]) def from_unicode(text, origin=root): """Convert unicode text into a Name object. - Lables are encoded in IDN ACE form. + Labels are encoded in IDN ACE form. @rtype: dns.name.Name object """ diff --git a/dns/rcode.py b/dns/rcode.py index 698ad25..314815f 100644 --- a/dns/rcode.py +++ b/dns/rcode.py @@ -62,7 +62,7 @@ class UnknownRcode(dns.exception.DNSException): def from_text(text): """Convert text into an rcode. - @param text: the texual rcode + @param text: the textual rcode @type text: string @raises UnknownRcode: the rcode is unknown @rtype: int diff --git a/dns/rdata.py b/dns/rdata.py index cb8c274..824731c 100644 --- a/dns/rdata.py +++ b/dns/rdata.py @@ -286,7 +286,7 @@ class Rdata(object): @type rdtype: int @param wire: The wire-format message @type wire: string - @param current: The offet in wire of the beginning of the rdata. + @param current: The offset in wire of the beginning of the rdata. @type current: int @param rdlen: The length of the wire-format rdata @type rdlen: int @@ -451,7 +451,7 @@ def from_wire(rdclass, rdtype, wire, current, rdlen, origin=None): @type rdtype: int @param wire: The wire-format message @type wire: string - @param current: The offet in wire of the beginning of the rdata. + @param current: The offset in wire of the beginning of the rdata. @type current: int @param rdlen: The length of the wire-format rdata @type rdlen: int diff --git a/dns/renderer.py b/dns/renderer.py index ed3ec66..ddc277c 100644 --- a/dns/renderer.py +++ b/dns/renderer.py @@ -88,7 +88,7 @@ class Renderer(object): then L{dns.exception.TooBig} will be raised. @type max_size: int @param origin: the origin to use when rendering relative names - @type origin: dns.name.Namem or None. + @type origin: dns.name.Name or None. """ self.output = BytesIO() diff --git a/dns/zone.py b/dns/zone.py index 81e0fcf..ae099bd 100644 --- a/dns/zone.py +++ b/dns/zone.py @@ -94,7 +94,7 @@ class Zone(object): if isinstance(origin, string_types): origin = dns.name.from_text(origin) elif not isinstance(origin, dns.name.Name): - raise ValueError("origin parameter must be convertable to a " + raise ValueError("origin parameter must be convertible to a " "DNS name") if not origin.is_absolute(): raise ValueError("origin parameter must be an absolute name") @@ -128,7 +128,7 @@ class Zone(object): if isinstance(name, string_types): name = dns.name.from_text(name, None) elif not isinstance(name, dns.name.Name): - raise KeyError("name parameter must be convertable to a DNS name") + raise KeyError("name parameter must be convertible to a DNS name") if name.is_absolute(): if not name.is_subdomain(self.origin): raise KeyError( diff --git a/examples/zonediff.py b/examples/zonediff.py index ad81fb1..0c10178 100755 --- a/examples/zonediff.py +++ b/examples/zonediff.py @@ -199,7 +199,7 @@ The differences shown will be logical differences, not textual differences. p.print_help() sys.exit(64) - # Open file desriptors + # Open file descriptors if not opts.use_vc: oldn, newn = args else: diff --git a/tests/test_dnssec.py b/tests/test_dnssec.py index e972a85..83d548d 100644 --- a/tests/test_dnssec.py +++ b/tests/test_dnssec.py @@ -209,13 +209,13 @@ class DNSSECValidatorTestCase(unittest.TestCase): self.failUnlessRaises(dns.dnssec.ValidationFailure, bad) @unittest.skipIf(not dns.dnssec._have_ecdsa, - "python ECDSA can not be imported") + "python ECDSA cannot be imported") def testAbsoluteECDSA384Good(self): dns.dnssec.validate(abs_ecdsa384_soa, abs_ecdsa384_soa_rrsig, abs_ecdsa384_keys, None, when4) @unittest.skipIf(not dns.dnssec._have_ecdsa, - "python ECDSA can not be imported") + "python ECDSA cannot be imported") def testAbsoluteECDSA384Bad(self): def bad(): dns.dnssec.validate(abs_other_ecdsa384_soa, abs_ecdsa384_soa_rrsig, diff --git a/tests/test_zone.py b/tests/test_zone.py index 9338f53..2123707 100644 --- a/tests/test_zone.py +++ b/tests/test_zone.py @@ -414,7 +414,7 @@ class ZoneTestCase(unittest.TestCase): self.failUnlessRaises(dns.exception.SyntaxError, bad) def testFirstRRStartsWithWhitespace(self): - # no name is specified, so default to the intial origin + # no name is specified, so default to the initial origin # no ttl is specified, so default to the initial TTL of 0 z = dns.zone.from_text(' IN A 10.0.0.1', origin='example.', check_origin=False) |