Lines 1-78
Link Here
|
1 |
--- ipaddr_test.py.orig 2016-01-05 00:38:35 UTC |
|
|
2 |
+++ ipaddr_test.py |
3 |
@@ -21,6 +21,10 @@ |
4 |
import unittest |
5 |
import time |
6 |
import ipaddr |
7 |
+import sys |
8 |
+ |
9 |
+if sys.version_info > (3,): |
10 |
+ long = int |
11 |
|
12 |
# Compatibility function to cast str to bytes objects |
13 |
if issubclass(ipaddr.Bytes, str): |
14 |
@@ -266,7 +270,7 @@ class IpaddrUnitTest(unittest.TestCase): |
15 |
'2001:658:22a:cafe:200::1') |
16 |
|
17 |
def testGetNetmask(self): |
18 |
- self.assertEqual(int(self.ipv4.netmask), 4294967040L) |
19 |
+ self.assertEqual(int(self.ipv4.netmask), 4294967040) |
20 |
self.assertEqual(str(self.ipv4.netmask), '255.255.255.0') |
21 |
self.assertEqual(str(self.ipv4_hostmask.netmask), '255.0.0.0') |
22 |
self.assertEqual(int(self.ipv6.netmask), |
23 |
@@ -283,7 +287,7 @@ class IpaddrUnitTest(unittest.TestCase): |
24 |
self.assertEqual(ipv6_zero_netmask._prefix_from_prefix_string('0'), 0) |
25 |
|
26 |
def testGetBroadcast(self): |
27 |
- self.assertEqual(int(self.ipv4.broadcast), 16909311L) |
28 |
+ self.assertEqual(int(self.ipv4.broadcast), 16909311) |
29 |
self.assertEqual(str(self.ipv4.broadcast), '1.2.3.255') |
30 |
|
31 |
self.assertEqual(int(self.ipv6.broadcast), |
32 |
@@ -1100,9 +1104,9 @@ class IpaddrUnitTest(unittest.TestCase): |
33 |
|
34 |
def testNetworkElementCaching(self): |
35 |
# V4 - make sure we're empty |
36 |
- self.assertFalse(self.ipv4._cache.has_key('network')) |
37 |
- self.assertFalse(self.ipv4._cache.has_key('broadcast')) |
38 |
- self.assertFalse(self.ipv4._cache.has_key('hostmask')) |
39 |
+ self.assertFalse('network' in self.ipv4._cache) |
40 |
+ self.assertFalse('broadcast' in self.ipv4._cache) |
41 |
+ self.assertFalse('hostmask' in self.ipv4._cache) |
42 |
|
43 |
# V4 - populate and test |
44 |
self.assertEqual(self.ipv4.network, ipaddr.IPv4Address('1.2.3.0')) |
45 |
@@ -1110,14 +1114,14 @@ class IpaddrUnitTest(unittest.TestCase): |
46 |
self.assertEqual(self.ipv4.hostmask, ipaddr.IPv4Address('0.0.0.255')) |
47 |
|
48 |
# V4 - check we're cached |
49 |
- self.assertTrue(self.ipv4._cache.has_key('network')) |
50 |
- self.assertTrue(self.ipv4._cache.has_key('broadcast')) |
51 |
- self.assertTrue(self.ipv4._cache.has_key('hostmask')) |
52 |
+ self.assertTrue('network' in self.ipv4._cache) |
53 |
+ self.assertTrue('broadcast' in self.ipv4._cache) |
54 |
+ self.assertTrue('hostmask' in self.ipv4._cache) |
55 |
|
56 |
# V6 - make sure we're empty |
57 |
- self.assertFalse(self.ipv6._cache.has_key('network')) |
58 |
- self.assertFalse(self.ipv6._cache.has_key('broadcast')) |
59 |
- self.assertFalse(self.ipv6._cache.has_key('hostmask')) |
60 |
+ self.assertFalse('network' in self.ipv6._cache) |
61 |
+ self.assertFalse('broadcast' in self.ipv6._cache) |
62 |
+ self.assertFalse('hostmask' in self.ipv6._cache) |
63 |
|
64 |
# V6 - populate and test |
65 |
self.assertEqual(self.ipv6.network, |
66 |
@@ -1128,9 +1132,9 @@ class IpaddrUnitTest(unittest.TestCase): |
67 |
ipaddr.IPv6Address('::ffff:ffff:ffff:ffff')) |
68 |
|
69 |
# V6 - check we're cached |
70 |
- self.assertTrue(self.ipv6._cache.has_key('network')) |
71 |
- self.assertTrue(self.ipv6._cache.has_key('broadcast')) |
72 |
- self.assertTrue(self.ipv6._cache.has_key('hostmask')) |
73 |
+ self.assertTrue('network' in self.ipv6._cache) |
74 |
+ self.assertTrue('broadcast' in self.ipv6._cache) |
75 |
+ self.assertTrue('hostmask' in self.ipv6._cache) |
76 |
|
77 |
def testTeredo(self): |
78 |
# stolen from wikipedia |