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

attempt to support python3

This commit is contained in:
root
2015-06-30 05:46:48 -07:00
parent 6b14b64e62
commit b1e358111f
28 changed files with 159 additions and 301 deletions

View File

@@ -4,7 +4,6 @@
# Author: Roopa Prabhu, roopa@cumulusnetworks.com
#
from sets import Set
from ifupdown.iface import *
import ifupdownaddons
from ifupdownaddons.modulebase import moduleBase
@@ -12,6 +11,11 @@ from ifupdownaddons.ifenslaveutil import ifenslaveutil
from ifupdownaddons.iproute2 import iproute2
import ifupdown.rtnetlink_api as rtnetlink_api
try:
from sets import Set as set
except ImportError:
pass
class ifenslave(moduleBase):
""" ifupdown2 addon module to configure bond interfaces """
_modinfo = { 'mhelp' : 'bond configuration module',
@@ -223,7 +227,7 @@ class ifenslave(moduleBase):
if not self.PERFMODE:
runningslaves = self.ifenslavecmd.get_slaves(ifaceobj.name);
for slave in Set(slaves).difference(Set(runningslaves)):
for slave in set(slaves).difference(set(runningslaves)):
if not self.PERFMODE and not self.ipcmd.link_exists(slave):
self.log_warn('%s: skipping slave %s, does not exist'
%(ifaceobj.name, slave))