Merge remote-tracking branch 'origin/python3.4' into python3.4

Author: dmptrluke

cloudbot/bot.py

@@ -195,72 +195,68 @@ def process(self, event):
         """
         :type event: Event
         """
-        try:
-            run_before_tasks = []
-            tasks = []
-            command_prefix = event.conn.config.get('command_prefix', '.')
-
-            # Raw IRC hook
-            for raw_hook in self.plugin_manager.catch_all_triggers:
-                # run catch-all coroutine hooks before all others - TODO: Make this a plugin argument
-                if not raw_hook.threaded:
-                    run_before_tasks.append(
-                        self.plugin_manager.launch(raw_hook, Event(hook=raw_hook, base_event=event)))
+        run_before_tasks = []
+        tasks = []
+        command_prefix = event.conn.config.get('command_prefix', '.')
+
+        # Raw IRC hook
+        for raw_hook in self.plugin_manager.catch_all_triggers:
+            # run catch-all coroutine hooks before all others - TODO: Make this a plugin argument
+            if not raw_hook.threaded:
+                run_before_tasks.append(
+                    self.plugin_manager.launch(raw_hook, Event(hook=raw_hook, base_event=event)))
+            else:
+                tasks.append(self.plugin_manager.launch(raw_hook, Event(hook=raw_hook, base_event=event)))
+        if event.irc_command in self.plugin_manager.raw_triggers:
+            for raw_hook in self.plugin_manager.raw_triggers[event.irc_command]:
+                tasks.append(self.plugin_manager.launch(raw_hook, Event(hook=raw_hook, base_event=event)))
+
+        # Event hooks
+        if event.type in self.plugin_manager.event_type_hooks:
+            for event_hook in self.plugin_manager.event_type_hooks[event.type]:
+                tasks.append(self.plugin_manager.launch(event_hook, Event(hook=event_hook, base_event=event)))
+
+        if event.type is EventType.message:
+            # Commands
+            if event.chan.lower() == event.nick.lower():  # private message, no command prefix
+                command_re = r'(?i)^(?:[{}]?|{}[,;:]+\s+)(\w+)(?:$|\s+)(.*)'.format(command_prefix, event.conn.nick)
+            else:
+                command_re = r'(?i)^(?:[{}]|{}[,;:]+\s+)(\w+)(?:$|\s+)(.*)'.format(command_prefix, event.conn.nick)
+
+            cmd_match = re.match(command_re, event.content)
+
+            if cmd_match:
+                command = cmd_match.group(1).lower()
+                if command in self.plugin_manager.commands:
+                    command_hook = self.plugin_manager.commands[command]
+                    command_event = CommandEvent(hook=command_hook, text=cmd_match.group(2).strip(),
+                                             triggered_command=command, base_event=event)
+                    tasks.append(self.plugin_manager.launch(command_hook, command_event))
                 else:
-                    tasks.append(self.plugin_manager.launch(raw_hook, Event(hook=raw_hook, base_event=event)))
-            if event.irc_command in self.plugin_manager.raw_triggers:
-                for raw_hook in self.plugin_manager.raw_triggers[event.irc_command]:
-                    tasks.append(self.plugin_manager.launch(raw_hook, Event(hook=raw_hook, base_event=event)))
-
-            # Event hooks
-            if event.type in self.plugin_manager.event_type_hooks:
-                for event_hook in self.plugin_manager.event_type_hooks[event.type]:
-                    tasks.append(self.plugin_manager.launch(event_hook, Event(hook=event_hook, base_event=event)))
-
-            if event.type is EventType.message:
-                # Commands
-                if event.chan.lower() == event.nick.lower():  # private message, no command prefix
-                    command_re = r'(?i)^(?:[{}]?|{}[,;:]+\s+)(\w+)(?:$|\s+)(.*)'.format(command_prefix, event.conn.nick)
+                    potential_matches = []
+                    for potential_match, plugin in self.plugin_manager.commands.items():
+                        if potential_match.startswith(command):
+                            potential_matches.append((potential_match, plugin))
+                    if potential_matches:
+                        if len(potential_matches) == 1:
+                            command_hook = potential_matches[0][1]
+                            command_event = CommandEvent(hook=command_hook, text=cmd_match.group(2).strip(),
+                                                     triggered_command=command, base_event=event)
+                            tasks.append(self.plugin_manager.launch(command_hook, command_event))
+                        else:
+                            event.notice("Possible matches: {}".format(
+                                formatting.get_text_list([command for command, plugin in potential_matches])))
+
+            # Regex hooks
+            for regex, regex_hook in self.plugin_manager.regex_hooks:
+                if not regex_hook.run_on_cmd and cmd_match:
+                    pass
                 else:
-                    command_re = r'(?i)^(?:[{}]|{}[,;:]+\s+)(\w+)(?:$|\s+)(.*)'.format(command_prefix, event.conn.nick)
-
-                cmd_match = re.match(command_re, event.content)
-
-                if cmd_match:
-                    command = cmd_match.group(1).lower()
-                    if command in self.plugin_manager.commands:
-                        command_hook = self.plugin_manager.commands[command]
-                        command_event = CommandEvent(hook=command_hook, text=cmd_match.group(2).strip(),
-                                                 triggered_command=command, base_event=event)
-                        tasks.append(self.plugin_manager.launch(command_hook, command_event))
-                    else:
-                        potential_matches = []
-                        for potential_match, plugin in self.plugin_manager.commands.items():
-                            if potential_match.startswith(command):
-                                potential_matches.append((potential_match, plugin))
-                        if potential_matches:
-                            if len(potential_matches) == 1:
-                                command_hook = potential_matches[0][1]
-                                command_event = CommandEvent(hook=command_hook, text=cmd_match.group(2).strip(),
-                                                         triggered_command=command, base_event=event)
-                                tasks.append(self.plugin_manager.launch(command_hook, command_event))
-                            else:
-                                event.notice("Possible matches: {}".format(
-                                    formatting.get_text_list([command for command, plugin in potential_matches])))
-
-                # Regex hooks
-                for regex, regex_hook in self.plugin_manager.regex_hooks:
-                    if not regex_hook.run_on_cmd and cmd_match:
-                        pass
-                    else:
-                        regex_match = regex.search(event.content)
-                        if regex_match:
-                            regex_event = RegexEvent(hook=regex_hook, match=regex_match, base_event=event)
-                            tasks.append(self.plugin_manager.launch(regex_hook, regex_event))
-
-            # Run the tasks
-            yield from asyncio.gather(*run_before_tasks, loop=self.loop)
-            yield from asyncio.gather(*tasks, loop=self.loop)
-
-        except:
-            logger.exception("Error while processing event")
+                    regex_match = regex.search(event.content)
+                    if regex_match:
+                        regex_event = RegexEvent(hook=regex_hook, match=regex_match, base_event=event)
+                        tasks.append(self.plugin_manager.launch(regex_hook, regex_event))
+
+        # Run the tasks
+        yield from asyncio.gather(*run_before_tasks, loop=self.loop)
+        yield from asyncio.gather(*tasks, loop=self.loop)

cloudbot/hook.py

@@ -298,4 +298,4 @@ def _on_start_hook(func):
 
 
 # this is temporary, to ease transition
-onload = on_start
+onload = on_start

cloudbot/util/dictionaries.py

@@ -40,4 +40,4 @@ def __getitem__(self, k):  # real signature unknown; restored from __doc__
 
     def __setitem__(self, k, v):  # real signature unknown
         """ Set self[key] to value. """
-        return super().__setitem__(k.lower() if k is not None else k, v)
+        return super().__setitem__(k.lower() if k is not None else k, v)

cloudbot/util/test/test_timeformat.py

@@ -35,4 +35,4 @@ def test_timeuntil():
     # basic
     assert timeuntil(future, now) == "1 month and 2 days"
     # count
-    assert timeuntil(future, now, count=3) == "1 month, 2 days and 13 hours"
+    assert timeuntil(future, now, count=3) == "1 month, 2 days and 13 hours"

cloudbot/util/timeformat.py

@@ -125,4 +125,4 @@ def format_time(seconds, count=3, accuracy=6, simple=False):
     if simple:
         return " ".join(strings)
     else:
-        return formatting.get_text_list(strings, "and")
+        return formatting.get_text_list(strings, "and")

plugins/core_tracker.py

@@ -90,4 +90,4 @@ def on_join(conn, chan, target):
     :type nick: str
     """
     if target == conn.nick:
-        bot_joined_channel(conn, chan)
+        bot_joined_channel(conn, chan)

plugins/ignore.py

@@ -144,4 +144,4 @@ def global_unignore(text, db, conn, notice):
         notice("{} is not globally ignored.".format(target))
     else:
         notice("{} has been globally un-ignored.".format(target))
-        remove_ignore(db, conn.name, "*", target)
+        remove_ignore(db, conn.name, "*", target)

plugins/lastfm.py

@@ -125,4 +125,4 @@ def lastfmcompare(text, bot):
     artist_string = "\x02In Common:\x02 " + ", ".join(artists) if artists else ""
 
     return "Musical compatibility between \x02{}\x02 and \x02{}\x02: {} (\x02{}%\x02)".format(user1, user2, level,
-                                                                                        score), artist_string
+                                                                                        score), artist_string

plugins/twitter.py

@@ -174,4 +174,4 @@ def twuser(text):
 
     return "{}@\x02{}\x02 ({}){} has \x02{:,}\x02 tweets and \x02{:,}\x02 followers.{}" \
            "".format(prefix, user.screen_name, user.name, loc_str, user.statuses_count, user.followers_count,
-                     desc_str)
+                     desc_str)