Merge "Replaced e.message with str(e)"
This commit is contained in:
commit
90e5f711cb
|
@ -33,7 +33,7 @@ def inSameSubnet(ip1, ip2, netmask_or_cidr):
|
|||
cidr2 = netaddr.IPNetwork("%s/%s" % (ip2, netmask_or_cidr))
|
||||
return cidr1 == cidr2
|
||||
except netaddr.AddrFormatError as e:
|
||||
log.exception(e.message)
|
||||
log.exception(str(e))
|
||||
return False
|
||||
|
||||
|
||||
|
|
|
@ -344,7 +344,7 @@ interface first.")
|
|||
try:
|
||||
objects.NetworkGroup(consts.ADMIN_NETWORK_ID).set(data)
|
||||
except error.HTTPError as e:
|
||||
log.error(e.message)
|
||||
log.error(str(e))
|
||||
modulehelper.ModuleHelper.display_dialog(
|
||||
self, error_msg=self.apply_dialog_message["message"],
|
||||
title=self.apply_dialog_message["title"])
|
||||
|
|
|
@ -110,7 +110,7 @@ class FeatureGroups(urwid.WidgetWrap):
|
|||
part1, part2 = setting.split("/")
|
||||
self.defaults[setting]["value"] = part2 in oldsettings[part1]
|
||||
except Exception as e:
|
||||
log.warning("unexpected error: %s", e.message)
|
||||
log.warning("unexpected error: %s", str(e))
|
||||
|
||||
def save(self, responses):
|
||||
newsettings = {}
|
||||
|
|
Loading…
Reference in New Issue