summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormshields@google.com <mshields@google.com@09200d28-7f98-11dd-ad27-0f66e57d2035>2010-08-16 23:53:12 +0000
committermshields@google.com <mshields@google.com@09200d28-7f98-11dd-ad27-0f66e57d2035>2010-08-16 23:53:12 +0000
commitd975acce77c2e9077af0e0d8023d167f5f825878 (patch)
tree3a98d7b72b146cd7dc4c8c26aa8a18278095c5c0
parentf4668eaf052c5c3d6e6d94cb07fa0b52337c0b50 (diff)
downloadipaddr-py-d975acce77c2e9077af0e0d8023d167f5f825878.tar.gz
Remove trailing whitespace.
git-svn-id: https://ipaddr-py.googlecode.com/svn@181 09200d28-7f98-11dd-ad27-0f66e57d2035
-rw-r--r--trunk/ipaddr.py4
-rwxr-xr-xtrunk/ipaddr_test.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/trunk/ipaddr.py b/trunk/ipaddr.py
index 7b94cd8..daed035 100644
--- a/trunk/ipaddr.py
+++ b/trunk/ipaddr.py
@@ -910,7 +910,7 @@ class _BaseNet(_IPAddrBase):
"""Return the network object with the host bits masked out."""
return IPNetwork('%s/%d' % (self.network, self._prefixlen),
version=self._version)
-
+
def subnet(self, prefixlen_diff=1, new_prefix=None):
"""Return a list of subnets, rather than an interator."""
return list(self.iter_subnets(prefixlen_diff, new_prefix))
@@ -1324,7 +1324,7 @@ class IPv4Network(_BaseV4, _BaseNet):
if parts[0] < parts[-1]:
return True
return False
-
+
def _is_valid_netmask(self, netmask):
"""Verify that the netmask is valid.
diff --git a/trunk/ipaddr_test.py b/trunk/ipaddr_test.py
index e0f6431..7d7ed0e 100755
--- a/trunk/ipaddr_test.py
+++ b/trunk/ipaddr_test.py
@@ -162,7 +162,7 @@ class IpaddrUnitTest(unittest.TestCase):
key=ipaddr.get_mixed_type_key))
self.assertEqual([v6addr, v6net], sorted([v6net, v6addr],
key=ipaddr.get_mixed_type_key))
-
+
def testIpFromInt(self):
self.assertEqual(self.ipv4.ip, ipaddr.IPv4Network(16909060).ip)
self.assertRaises(ipaddr.AddressValueError,