Merge branch 'master' of ssh://pwan.org/var/www/git/projects/margebot

[margebot.git] / plugins / marge.py

diff --git a/plugins/marge.py b/plugins/marge.py
index 9343bb9..0cbe525 100755 (executable)
--- a/plugins/marge.py
+++ b/plugins/marge.py
@@ -7,7 +7,7 @@ from time import sleep
 from dateutil import parser
 from dateutil.tz import tzutc
 from dateutil.relativedelta import relativedelta
-from errbot import BotPlugin, botcmd, arg_botcmd, re_botcmd, webhook
+from errbot import BotPlugin, arg_botcmd, botcmd, re_botcmd, webhook
 from errbot.templating import tenv
 from errcron.bot import CrontabMixin
 import gitlab
@@ -104,6 +104,7 @@ class Marge(BotPlugin, CrontabMixin):
         self.chatroom_host = None
         self.gitlab = None
         self.soak_delta = None
+        self.webhook_url = None
         super().__init__(*args, **kwargs)
 
     def get_configuration_template(self):
@@ -328,8 +329,6 @@ class Marge(BotPlugin, CrontabMixin):
             for a_room in notify_rooms.split(','):
                 reminder_msg[a_room].append(msg_dict)
 
-        self['OPEN_MRS'] = open_mrs
-
         # Remind each of the rooms about open MRs
         for a_room, room_msg_list in reminder_msg.items():
             if room_msg_list != []: