summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-05-23 21:17:22 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-05-23 21:17:22 (GMT)
commitb95c63413d3ac5963187b6d528b1147229a1f190 (patch)
tree62878a8a8ead8fe39e12cb015aaa853f01231d50
parent876ecad9f513f69a7710cea88ce35df927d7ddba (diff)
downloadcpython-b95c63413d3ac5963187b6d528b1147229a1f190.zip
cpython-b95c63413d3ac5963187b6d528b1147229a1f190.tar.gz
cpython-b95c63413d3ac5963187b6d528b1147229a1f190.tar.bz2
Issue #14814: minor improvements as suggested by Hynek Schlawack
-rw-r--r--Lib/ipaddress.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index c0e65e9..9b584fc 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python3
-#
# Copyright 2007 Google Inc.
# Licensed to PSF under a Contributor Agreement.
#
@@ -146,6 +144,7 @@ def ip_interface(address, version=None):
The IPv?Interface classes describe an Address on a particular
Network, so they're basically a combination of both the Address
and Network classes.
+
"""
if version is not None:
if version == 4:
@@ -181,6 +180,7 @@ def v4_int_to_packed(address):
Raises:
ValueError: If the integer is negative or too large to be an
IPv4 IP address.
+
"""
try:
return struct.pack('!I', address)
@@ -196,6 +196,7 @@ def v6_int_to_packed(address):
Returns:
The integer address packed as 16 bytes in network (big-endian) order.
+
"""
try:
return struct.pack('!QQ', address >> 64, address & (2**64 - 1))
@@ -221,6 +222,7 @@ def _find_address_range(addresses):
break
return (first, last)
+
def _get_prefix_length(number1, number2, bits):
"""Get the number of leading bits that are same for two numbers.
@@ -238,6 +240,7 @@ def _get_prefix_length(number1, number2, bits):
return bits - i
return 0
+
def _count_righthand_zero_bits(number, bits):
"""Count the number of zero bits on the right hand side.
@@ -319,6 +322,7 @@ def summarize_address_range(first, last):
first_int = current + 1
first = ip_address(first_int, version=first._version)
+
def _collapse_addresses_recursive(addresses):
"""Loops through the addresses, collapsing concurrent netblocks.
@@ -632,8 +636,8 @@ class _BaseNetwork(_IPAddressBase):
def hosts(self):
"""Generate Iterator over usable hosts in a network.
- This is like __iter__ except it doesn't return the network
- or broadcast addresses.
+ This is like __iter__ except it doesn't return the network
+ or broadcast addresses.
"""
cur = int(self.network_address) + 1
@@ -1965,8 +1969,7 @@ class _BaseV6(object):
class IPv6Address(_BaseV6, _BaseAddress):
- """Represent and manipulate single IPv6 Addresses.
- """
+ """Represent and manipulate single IPv6 Addresses."""
def __init__(self, address):
"""Instantiate a new IPv6 address object.