Merge branch '2.1' into 2.2

pull/1681/head
grossmj 5 years ago
commit 7cd9bb6ca6

@ -100,7 +100,7 @@ class Node:
try: try:
setattr(self, prop, kwargs[prop]) setattr(self, prop, kwargs[prop])
except AttributeError as e: except AttributeError as e:
log.critical("Cannot set attribute '%s'".format(prop)) log.critical("Cannot set attribute '{}'".format(prop))
raise e raise e
else: else:
if prop not in self.CONTROLLER_ONLY_PROPERTIES and kwargs[prop] is not None and kwargs[prop] != "": if prop not in self.CONTROLLER_ONLY_PROPERTIES and kwargs[prop] is not None and kwargs[prop] != "":

Loading…
Cancel
Save