AaronFiore/electrum
1
0
Fork 0
Code Activity

cleanup six (no python2 support)

Browse Source
This commit is contained in:
ThomasV
2017-09-04 14:43:31 +02:00
parent f8c592f743
commit 216e9403be
21 changed files with 33 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/dnssec.py
View File

@@ -27,7 +27,6 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import six
# Check DNSSEC trust chain.
@@ -75,7 +74,7 @@ def python_validate_rrsig(rrset, rrsig, keys, origin=None, now=None):
from dns.dnssec import ValidationFailure, ECDSAP256SHA256, ECDSAP384SHA384
from dns.dnssec import _find_candidate_keys, _make_hash, _is_ecdsa, _is_rsa, _to_rdata, _make_algorithm_id
if isinstance(origin, six.text_type):
if isinstance(origin, str):
origin = dns.name.from_text(origin, dns.name.root)
for candidate_key in _find_candidate_keys(keys, rrsig):