From: Filip Š <filip.stamcar@hotmail.com>
Date: Mon, 30 Sep 2019 20:39:35 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/rthalley/dnspython into dns-over-https
X-Git-Tag: v2.0.0rc1~345^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2ae5bc83ebecb6fa24868eb458734cc942bb0d8;p=thirdparty%2Fdnspython.git

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

c2ae5bc83ebecb6fa24868eb458734cc942bb0d8
diff --cc dns/query.py
index 62b50143,ac15895a..598fa8bd
--- a/dns/query.py
+++ b/dns/query.py
@@@ -19,8 -19,8 +19,9 @@@
  
  from __future__ import generators
  
 +import urllib.request
  import errno
+ import os
  import select
  import socket
  import struct