diff options
| author | Martin <martin.basti@gmail.com> | 2017-07-15 01:36:07 +0200 |
|---|---|---|
| committer | Martin <martin.basti@gmail.com> | 2017-07-19 15:41:45 +0200 |
| commit | 89ab9104cf1609437dd4b31c43f246e34e55ec02 (patch) | |
| tree | a3f8b704829128f56b255edfaaf1d249995d8bf5 /tests | |
| parent | efcc6e94e161048ced8a53d64009746f7f6426b5 (diff) | |
| download | dnspython-89ab9104cf1609437dd4b31c43f246e34e55ec02.tar.gz | |
Unify PY2/3 detection
dns._compat module contains constants PY2 and PY3 which should be used
for detection of python version, to have only one method and avoid
duplications
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_resolver.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/test_resolver.py b/tests/test_resolver.py index 81021fa..183d2a1 100644 --- a/tests/test_resolver.py +++ b/tests/test_resolver.py @@ -28,7 +28,7 @@ import dns.name import dns.rdataclass import dns.rdatatype import dns.resolver -from dns._compat import xrange +from dns._compat import xrange, PY3 # Some tests require the internet to be available to run, so let's # skip those if it's not there. @@ -280,12 +280,11 @@ class NXDOMAINExceptionTestCase(unittest.TestCase): def test_nxdomain_compatible(self): n1 = dns.name.Name(('a', 'b', '')) n2 = dns.name.Name(('a', 'b', 's', '')) - py3 = (sys.version_info[0] > 2) try: raise dns.resolver.NXDOMAIN except dns.exception.DNSException as e: - if not py3: + if not PY3: # pylint: disable=exception-message-attribute self.assertTrue((e.message == e.__doc__)) self.assertTrue((e.args == (e.__doc__,))) @@ -297,7 +296,7 @@ class NXDOMAINExceptionTestCase(unittest.TestCase): try: raise dns.resolver.NXDOMAIN("errmsg") except dns.exception.DNSException as e: - if not py3: + if not PY3: # pylint: disable=exception-message-attribute self.assertTrue((e.message == "errmsg")) self.assertTrue((e.args == ("errmsg",))) @@ -309,7 +308,7 @@ class NXDOMAINExceptionTestCase(unittest.TestCase): try: raise dns.resolver.NXDOMAIN("errmsg", -1) except dns.exception.DNSException as e: - if not py3: + if not PY3: # pylint: disable=exception-message-attribute self.assertTrue((e.message == "")) self.assertTrue((e.args == ("errmsg", -1))) @@ -337,7 +336,7 @@ class NXDOMAINExceptionTestCase(unittest.TestCase): raise dns.resolver.NXDOMAIN(qnames=[n1]) except dns.exception.DNSException as e: MSG = "The DNS query name does not exist: a.b." - if not py3: + if not PY3: # pylint: disable=exception-message-attribute self.assertTrue((e.message == MSG), e.message) self.assertTrue((e.args == (MSG,)), repr(e.args)) @@ -354,7 +353,7 @@ class NXDOMAINExceptionTestCase(unittest.TestCase): e0 = dns.resolver.NXDOMAIN("errmsg") e = e0 + e MSG = "None of DNS query names exist: a.b.s., a.b." - if not py3: + if not PY3: # pylint: disable=exception-message-attribute self.assertTrue((e.message == MSG), e.message) self.assertTrue((e.args == (MSG,)), repr(e.args)) @@ -374,7 +373,7 @@ class NXDOMAINExceptionTestCase(unittest.TestCase): raise dns.resolver.NXDOMAIN(qnames=[n1], responses={n1: 'r1.1'}) except Exception as e: MSG = "The DNS query name does not exist: a.b." - if not py3: + if not PY3: # pylint: disable=exception-message-attribute self.assertTrue((e.message == MSG), e.message) self.assertTrue((e.args == (MSG,)), repr(e.args)) |