From: Bob Halley <halley@dnspython.org>
Date: Fri, 3 Apr 2020 17:29:43 +0000 (-0700)
Subject: fix type specification errors
X-Git-Tag: v2.0.0rc1~304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb72edbb6d3cb30b4e21e9aab24b9b83c3f07b2a;p=thirdparty%2Fdnspython.git

fix type specification errors
---

diff --git a/dns/dnssec.pyi b/dns/dnssec.pyi
index 89027477..1f3f8b9d 100644
--- a/dns/dnssec.pyi
+++ b/dns/dnssec.pyi
@@ -4,6 +4,7 @@ import dns.rdtypes.ANY.DS as DS
 import dns.rdtypes.ANY.DNSKEY as DNSKEY
 
 _have_pycrypto : bool
+_have_ecpy : bool
 
 def validate_rrsig(rrset : Union[Tuple[name.Name, rdataset.Rdataset], rrset.RRset], rrsig : rdata.Rdata, keys : Dict[name.Name, Union[node.Node, rdataset.Rdataset]], origin : Optional[name.Name] = None, now : Optional[int] = None) -> None:
     ...
@@ -17,5 +18,5 @@ class ValidationFailure(exception.DNSException):
 def make_ds(name : name.Name, key : DNSKEY.DNSKEY, algorithm : str, origin : Optional[name.Name] = None) -> DS.DS:
     ...
 
-def nsec3_hash(domain: str, salt: Optional[str, bytes], iterations: int, algo: int) -> str:
+def nsec3_hash(domain: str, salt: Optional[Union[str, bytes]], iterations: int, algo: int) -> str:
     ...
diff --git a/dns/query.pyi b/dns/query.pyi
index 3b76786a..99974a18 100644
--- a/dns/query.pyi
+++ b/dns/query.pyi
@@ -2,11 +2,16 @@ from typing import Optional, Union, Dict, Generator, Any
 from . import tsig, rdatatype, rdataclass, name, message
 from requests.sessions import Session
 
+# If the ssl import works, then
+#
+#    error: Name 'ssl' already defined (by an import)
+#
+# is expected and can be ignored.
 try:
     import ssl
 except ImportError:
     class ssl(object):
-        SSLContext = {}
+        SSLContext : Dict = {}
 
 def https(q : message.Message, where: str, timeout : Optional[float] = None, port : Optional[int] = 443, af : Optional[int] = None, source : Optional[str] = None, source_port : Optional[int] = 0,
           session: Optional[Session] = None, path : Optional[str] = '/dns-query', post : Optional[bool] = True, bootstrap_address : Optional[str] = None, verify : Optional[bool] = True) -> message.Message:
diff --git a/dns/zone.pyi b/dns/zone.pyi
index 911d7a01..272814fe 100644
--- a/dns/zone.pyi
+++ b/dns/zone.pyi
@@ -38,7 +38,7 @@ class Zone:
         ...
     def to_file(self, f : Union[TextIO, BinaryIO, str], sorted=True, relativize=True, nl : Optional[bytes] = None):
         ...
-    def to_text(self, sorted=True, relativize=True, nl : Optional[bytes] = None) -> bytes:
+    def to_text(self, sorted=True, relativize=True, nl : Optional[str] = None) -> str:
         ...
 
 def from_xfr(xfr : Generator[Any,Any,message.Message], zone_factory : Callable[..., zone.Zone] = zone.Zone, relativize=True, check_origin=True):