Repository :
http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
---------------------------------------------------------------
commit cf38b77ba119233180c99fc30a9461c9740e6f25
Author: Peter Hatina <phatina(a)redhat.com>
Date: Sun Oct 7 10:03:53 2012 +0200
some minor changes in fmci_address.py
---------------------------------------------------------------
cli-tools/fmci/fmci_address.py | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/cli-tools/fmci/fmci_address.py b/cli-tools/fmci/fmci_address.py
index cb52493..d69a7a4 100644
--- a/cli-tools/fmci/fmci_address.py
+++ b/cli-tools/fmci/fmci_address.py
@@ -37,8 +37,7 @@ class FmciIpv4Addr(object):
self.m_member = member
def enumerate(self):
- pattern = re.compile("^{(.*)}$")
- match = pattern.search(self.m_member)
+ match = re.search("^{(.*)}$", self.m_member)
member = match.group(1) if match else []
if not member:
return [self.m_member]
@@ -46,12 +45,12 @@ class FmciIpv4Addr(object):
try:
members = []
for r in ranges:
- if not 0 <= int(r[0]) <= 255 or not 0 <= int(r[-1]) <=
255:
- return []
low = int(r[0])
high = int(r[-1])
if low > high:
low, high = high, low
+ if not 0 <= low <= 255 or not 0 <= high <= 255:
+ return []
members += [str(i) for i in range(low, high + 1)]
except ValueError:
return []
@@ -97,12 +96,11 @@ class FmciIpv4Addr(object):
return []
members = []
for m in str_members:
- ipm = FmciIpv4Addr.FmciIpv4Member(m)
- members.append(ipm)
- addresses = members[3].enumerate()
+ members.append(FmciIpv4Addr.FmciIpv4Member(m))
+ addresses = members[-1].enumerate()
if not addresses:
return []
- for i in reversed(range(0, 3)):
+ for i in reversed(range(0, len(members) - 1)):
combined = []
members_to_combine = members[i].enumerate()
if not members_to_combine:
@@ -128,8 +126,7 @@ class FmciIpv6Addr(object):
self.m_member = member
def enumerate(self):
- pattern = re.compile("^{(.*)}$")
- match = pattern.search(self.m_member)
+ match = re.search("^{(.*)}$", self.m_member)
member = match.group(1) if match else []
if not member:
return [self.m_member]