edmond/bot.py

@@ -114,8 +114,6 @@ class Bot(irc.client.SimpleIRCClient, Logger):
         try:
             self.start()
         except KeyboardInterrupt:
-            self.log_i("Caught keyboard interrupt.")
-        finally:
             self.log_i("Stopping Edmond.")
             self.__save_storage()
 

edmond/plugins/wikipedia.py

@@ -40,7 +40,7 @@ class WikipediaPlugin(Plugin):
             try:
                 summary = wikipedia.summary(wikipedia.random(), sentences=1)
                 break
-            except:  # The wikipedia package can raise a lot of different stuff.
+            except wikipedia.exceptions.WikipediaException:
                 pass
             retries -= 1
         if summary:
@@ -59,7 +59,7 @@ class WikipediaPlugin(Plugin):
             except wikipedia.exceptions.PageError:
                 summary = self.config["empty_response"]
                 break
-            except:
+            except wikipedia.exceptions.WikipediaException:
                 summary = self.bot.config["error_message"]
                 # Keep trying after a slight delay.
                 time.sleep(1)

edmond/plugins/youtube_parser.py

@@ -35,8 +35,10 @@ class YoutubeParserPlugin(Plugin):
     def on_pubmsg(self, event):
         words = event.arguments[0].split()
         for word in words:
+            self.bot.log_d("testing " + word)
             match = self.VIDEO_URL_RE.match(word)
             if match:
+                self.bot.log_d("match!")
                 return self.handle_match(match, event.target)
         return False