From: Filip Š <filip.stamcar@hotmail.com>
Date: Tue, 29 Oct 2019 19:44:53 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/rthalley/dnspython into dns-over-https
X-Git-Tag: v2.0.0rc1~345^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6afaf3c5b8af5326dc3e4c4f0d29d0ede9ea2c7;p=thirdparty%2Fdnspython.git

Merge branch 'master' of https://github.com/rthalley/dnspython into dns-over-https
---

b6afaf3c5b8af5326dc3e4c4f0d29d0ede9ea2c7
diff --cc dns/query.pyi
index 26012e5d,aeb58cb9..d3d9a48e
--- a/dns/query.pyi
+++ b/dns/query.pyi
@@@ -1,10 -1,14 +1,17 @@@
  from typing import Optional, Union, Dict, Generator, Any
 -from . import tsig, rdatatype, rdataclass, name, message
 +from . import message, tsig, rdatatype, rdataclass, name, message
+ 
+ try:
+     import ssl
+ except ImportError:
+     class ssl(object):
+         SSLContext = {}
+ 
 +def doh(query : message.Message, nameserver : str, post=True) -> message.Message:
 +    pass
 +
- def tcp(q : message.Message, where : str, timeout : float = None, port=53, af : Optional[int] = None, source : Optional[str] = None, source_port : int = 0,
-         one_rr_per_rrset=False) -> message.Message:
+ def tcp(q : message.Message, where : str, timeout : float = None, port=53, af : Optional[int] = None, source : Optional[str] = None, source_port : Optional[int] = 0,
+         one_rr_per_rrset : Optional[bool] = False, ignore_trailing : Optional[bool] = False) -> message.Message:
      pass
  
  def xfr(where : None, zone : Union[name.Name,str], rdtype=rdatatype.AXFR, rdclass=rdataclass.IN,