From c24c1f41ea5122d233feec47ebf13d5d9351e666 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sun, 21 Feb 2016 01:09:32 -0500 Subject: [PATCH 1/2] Fix null error when joining strings --- notifications/handlers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/notifications/handlers.py b/notifications/handlers.py index 9d11ad69..720ed07c 100644 --- a/notifications/handlers.py +++ b/notifications/handlers.py @@ -13,7 +13,8 @@ class NotificationHandler(logging.Handler): notif.title = "%s [%s:%s]" % (record.levelname, record.funcName, record.lineno) notif.level = str([item[0] for item in Notification.LEVEL_CHOICES if item[1] == record.levelname][0]) message = record.getMessage() - message = message + "\n\n" - message = message + record.exc_text + if record.exc_text: + message = message + "\n\n" + message = message + record.exc_text notif.message = message notif.save() From 3a1537ca32fd026dd5779b7b3f0c160f15a06b89 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Sun, 21 Feb 2016 23:21:57 -0500 Subject: [PATCH 2/2] Cast string to list if one jabber group returned Fixes #199 --- services/managers/openfire_manager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/managers/openfire_manager.py b/services/managers/openfire_manager.py index f82f69c3..4c2a2c63 100755 --- a/services/managers/openfire_manager.py +++ b/services/managers/openfire_manager.py @@ -103,6 +103,8 @@ class OpenfireManager: remote_groups = [] if response: remote_groups = response['groupname'] + if isinstance(remote_groups, basestring): + remote_groups = [remote_groups] logger.debug("Openfire user %s has groups %s" % (username, remote_groups)) add_groups = [] del_groups = []