Merge pull request #17 from damascene/master

update to be able to load plugin with python 3
This commit is contained in:
Nicolas Coevoet 2016-01-26 10:29:33 +01:00
commit 3c9900a1b0

View File

@ -57,7 +57,7 @@ except ImportError:
try: try:
from netaddr import IPAddress, IPNetwork from netaddr import IPAddress, IPNetwork
except: except:
print 'CIDR computation is not available: netaddress or ipaddress must be installed' print('CIDR computation is not available: netaddress or ipaddress must be installed')
#due to more kind of pattern checked, increase size #due to more kind of pattern checked, increase size
@ -1144,7 +1144,7 @@ def getWrapper(name):
group = group.get(parts.pop(0)) group = group.get(parts.pop(0))
except (registry.NonExistentRegistryEntry, except (registry.NonExistentRegistryEntry,
registry.InvalidRegistryName): registry.InvalidRegistryName):
raise registry.InvalidRegistryName, name raise registry.InvalidRegistryName(name)
return group return group
def listGroup(group): def listGroup(group):