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

12
ifupdown2/ifupdown/networkinterfaces.py
View File

@@ -128,8 +128,8 @@ class networkInterfaces():
Warns on error
"""
if callback_name not in self.callbacks.keys():
print 'warning: invalid callback ' + callback_name
if callback_name not in list(self.callbacks.keys()):
print('warning: invalid callback ' + callback_name)
return -1
self.callbacks[callback_name] = callback_func
@@ -396,7 +396,7 @@ class networkInterfaces():
def _is_keyword(self, str):
# The additional split here is for allow- keyword
if (str in self.network_elems.keys() or
if (str in list(self.network_elems.keys()) or
str.split('-')[0] == 'allow'):
return 1
return 0
@@ -407,7 +407,7 @@ class networkInterfaces():
def get_allow_classes_for_iface(self, ifacename):
classes = []
for class_name, ifacenames in self.allow_classes.items():
for class_name, ifacenames in list(self.allow_classes.items()):
if ifacename in ifacenames:
classes.append(class_name)
return classes
@@ -455,7 +455,7 @@ class networkInterfaces():
self._currentfile_has_template = False
else:
self._currentfile_has_template = True
except Exception, e:
except Exception as e:
self._parse_error(self._currentfile, -1,
'failed to render template (%s). Continue without template rendering ...'
% str(e))
@@ -474,7 +474,7 @@ class networkInterfaces():
try:
with open(filename) as f:
filedata = f.read()
except Exception, e:
except Exception as e:
self.logger.warn('error processing file %s (%s)',
filename, str(e))
return