Merge pull request #460 from bwelling/remove-future

author Bob Halley <halley@dnspython.org>

Fri, 1 May 2020 19:04:28 +0000 (12:04 -0700)

committer GitHub <noreply@github.com>

Fri, 1 May 2020 19:04:28 +0000 (12:04 -0700)
author Bob Halley <halley@dnspython.org>
Fri, 1 May 2020 19:04:28 +0000 (12:04 -0700)
committer GitHub <noreply@github.com>
Fri, 1 May 2020 19:04:28 +0000 (12:04 -0700)
diff --cc dns/query.py
Simple merge
diff --cc tests/test_name.py
Simple merge
author	Bob Halley <halley@dnspython.org>
	Fri, 1 May 2020 19:04:28 +0000 (12:04 -0700)
committer	GitHub <noreply@github.com>
	Fri, 1 May 2020 19:04:28 +0000 (12:04 -0700)
		1	2
dns/query.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_name.py	patch \|	diff1 \|	diff2 \|	blob \| history