On ne retient pas les trailing spaces d'un author

diff --git a/config.py b/config.py
index c42357e6f9ce1cb872f42630483433b36c3f0193..ae88a9190929196e5f2b26d1ecc5583e60d20f9f 100644 (file)
--- a/config.py
+++ b/config.py
@@ -110,7 +110,7 @@ helpmsg_overops = u" SAY DO STAY NOSTAY OPS OVEROPS KICK DIE CRASH"
 blacklisted_masks = [("Flo!*@*", [])]
 
 #: Regexp utilisée pour parser des quotes
-quote_regexp = ur"""\s*("|«|')\s*(?P<content>.*?)\s*("|»|') ?~ ?(?P<author>.*)"""
+quote_regexp = ur"""\s*("|«|')\s*(?P<content>.*?)\s*("|»|') ?~ ?(?P<author>.*?)\s*$"""
 
 #: Template pour afficher une quote
 quote_template = u"« %(content)s » ~ %(author)s"

diff --git a/parrot.py b/parrot.py
index cf033b7d0d0a70448191fa30703ab18ff5751a2e..01ed82adecb1070b80b7d6c86928723b6ba46a2f 100755 (executable)
--- a/parrot.py
+++ b/parrot.py
@@ -85,7 +85,8 @@ class Parrot(ircbot.SingleServerIRCBot):
         self.last_perdu = 0
         
         self.quotedb = quotes.QuoteDB()
-        self.quotedb.load()
+        self.reload_quotes()
+
     
     ### Utilitaires
     def _getnick(self):
@@ -122,10 +123,15 @@ class Parrot(ircbot.SingleServerIRCBot):
         quit_message = random.choice(config.quit_messages)
         self.die(msg=quit_message.encode("utf8"))
     
+    def reload_quotes(self):
+        """ Recharge la base de données des quotes et recompile la regexp de quote """
+        self.quotedb.load()
+        self.quote_pattern = re.compile(config.quote_regexp, flags=re.UNICODE)
+
     def execute_reload(self, auteur=None):
         """Recharge la config."""
         reload(config)
-        self.quotedb.load()
+        self.reload_quotes()
         if auteur in [None, "SIGHUP"]:
             towrite = "Config reloaded" + " (SIGHUP received)" * (auteur == "SIGHUP")
             for to in config.report_bugs_to: