summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P. D. Moss <drkjam@gmail.com>2009-04-28 23:13:14 +0000
committerDavid P. D. Moss <drkjam@gmail.com>2009-04-28 23:13:14 +0000
commit75381b18c7b1afbdbd8b378302ef99c992c0afb1 (patch)
treee8d08be1bc8e06e81015c6308c9f41f462ccf0d2
parent4e7e302f8cb485a59ca7cb7b02611b558dead25f (diff)
downloadnetaddr-75381b18c7b1afbdbd8b378302ef99c992c0afb1.tar.gz
Replaced some Python 2.3.x compatible code.
-rwxr-xr-xnetaddr/address.py3
-rwxr-xr-xnetaddr/eui/__init__.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/netaddr/address.py b/netaddr/address.py
index 99f7d2a..04782d8 100755
--- a/netaddr/address.py
+++ b/netaddr/address.py
@@ -2453,6 +2453,7 @@ class Wildcard(IPRange):
addr_type = AddrTypeDescriptor(ADDR_TYPES)
fmt = FormatDescriptor(IP)
+ @staticmethod
def is_valid(wildcard):
"""
A static method that validates wildcard address ranges.
@@ -2501,8 +2502,6 @@ class Wildcard(IPRange):
return False
return True
- is_valid = staticmethod(is_valid)
-
def __init__(self, wildcard, fmt=IP):
"""
Constructor.
diff --git a/netaddr/eui/__init__.py b/netaddr/eui/__init__.py
index d2e42c9..8d665ae 100755
--- a/netaddr/eui/__init__.py
+++ b/netaddr/eui/__init__.py
@@ -346,6 +346,7 @@ class IAB(object):
For online details see - http://standards.ieee.org/regauth/oui/
"""
+ @staticmethod
def split_iab_mac(eui_int, strict=False):
"""
@param eui_int: a MAC IAB as an unsigned integer.
@@ -370,8 +371,6 @@ class IAB(object):
return iab_bits, user_bits
- split_iab_mac = staticmethod(split_iab_mac)
-
def __init__(self, iab, strict=False):
"""
Constructor