mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

python3: 2to3 changes

Browse Source 
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2019-12-17 16:55:49 +01:00
parent 35681c0608
commit 3b01ed7618
41 changed files with 479 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ifupdown2/lib/iproute2.py
View File

@@ -159,7 +159,7 @@ class IPRoute2(Cache, Requirements):
try:
if not self.__batch_mode or not self.__batch:
return
for prefix, commands in self.__batch.iteritems():
for prefix, commands in self.__batch.items():
utils.exec_command(
"%s -force -batch -" % prefix,
stdin="\n".join(commands)
@@ -352,7 +352,7 @@ class IPRoute2(Cache, Requirements):
cmd.append("tunnel add %s mode %s" % (tunnelname, mode))
if attrs:
for k, v in attrs.iteritems():
for k, v in attrs.items():
cmd.append(k)
if v:
cmd.append(v)
@@ -366,7 +366,7 @@ class IPRoute2(Cache, Requirements):
return
cmd = ["tunnel change %s" % tunnelname]
if attrs:
for k, v in attrs.iteritems():
for k, v in attrs.items():
cmd.append(k)
if v:
cmd.append(v)
@@ -474,7 +474,7 @@ class IPRoute2(Cache, Requirements):
try:
self.__execute_or_batch(utils.ip_cmd, "addr flush dev %s" % ifname)
except Exception, e:
except Exception as e:
self.logger.warning("%s: flushing all ip address failed: %s" % (ifname, str(e)))
for addr in address_list:
try:
@@ -738,6 +738,6 @@ class IPRoute2(Cache, Requirements):
if rline:
rattrs = rline.split()
return rattrs[rattrs.index("dev") + 1]
except Exception, e:
except Exception as e:
self.logger.debug("ip_route_get_dev: failed .. %s" % str(e))
return None