diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2018-04-11 07:05:05 -0700 |
|---|---|---|
| committer | Jon Dufresne <jon.dufresne@gmail.com> | 2018-04-11 07:05:05 -0700 |
| commit | bb2617695dd5d27a2f5ed9e609b36ec4c9599c7a (patch) | |
| tree | 8129dc8637fc55689435479430fc99317ca909d5 | |
| parent | d180a090575de2ca7f6eecf0007a5793875935b8 (diff) | |
| download | ipaddress-bb2617695dd5d27a2f5ed9e609b36ec4c9599c7a.tar.gz | |
Avoid using assertRaises as a context manager
It is not compatible with Python 2.6 and causes test failures.
| -rw-r--r-- | test_ipaddress.py | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/test_ipaddress.py b/test_ipaddress.py index 145dc1a..2cbe36a 100644 --- a/test_ipaddress.py +++ b/test_ipaddress.py @@ -545,18 +545,26 @@ class NetworkTestCase_v4(BaseTestCase, NetmaskTestMixin_v4): self.factory('10.0.0.0/30'))) def test_subnet_of_mixed_types(self): - with self.assertRaises(TypeError): - ipaddress.IPv4Network('10.0.0.0/30').supernet_of( - ipaddress.IPv6Network('::1/128')) - with self.assertRaises(TypeError): - ipaddress.IPv6Network('::1/128').supernet_of( - ipaddress.IPv4Network('10.0.0.0/30')) - with self.assertRaises(TypeError): - ipaddress.IPv4Network('10.0.0.0/30').subnet_of( - ipaddress.IPv6Network('::1/128')) - with self.assertRaises(TypeError): - ipaddress.IPv6Network('::1/128').subnet_of( - ipaddress.IPv4Network('10.0.0.0/30')) + self.assertRaises( + TypeError, + ipaddress.IPv4Network('10.0.0.0/30').supernet_of, + ipaddress.IPv6Network('::1/128'), + ) + self.assertRaises( + TypeError, + ipaddress.IPv6Network('::1/128').subnet_of, + ipaddress.IPv4Network('10.0.0.0/30'), + ) + self.assertRaises( + TypeError, + ipaddress.IPv4Network('10.0.0.0/30').subnet_of, + ipaddress.IPv6Network('::1/128'), + ) + self.assertRaises( + TypeError, + ipaddress.IPv6Network('::1/128').subnet_of, + ipaddress.IPv4Network('10.0.0.0/30'), + ) class NetmaskTestMixin_v6(CommonTestMixin_v6): |