X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=quotes.py;h=85d290e5559e35cc1e533bc70ee9d2dd717ee747;hb=b393b2849cc38986109ceabe2501919c12487859;hp=9685220ab744e10a86e18d2b342486f109fd64d1;hpb=8cd38f1a95e0bd6542ba6704407b8ac33befd6ff;p=bots%2Fparrot.git

diff --git a/quotes.py b/quotes.py
index 9685220..85d290e 100644
--- a/quotes.py
+++ b/quotes.py
@@ -59,18 +59,15 @@ class Quote(object):
     
     def __unicode__(self):
         """ Retourne la quote affichable """
-        if self.place and self.place.strip() != u"":
-            return config.quote_template_withcontext % self.__dict__
-        else:
-            return config.quote_template % self.__dict__
+        return config.quote_template % self.__dict__
     def __str__(self):
         return unicode(self).encode("utf-8")
     
     def full_str(self):
         """ Retourne une chaîne représentant la totalité des infos de la quote,
             tout en étant parsable et human-readable. """
-        place = self.place if self.place else ""
-        quoter = self.quoter if self.quoter else ""
+        place = self.place if self.place and self.place.strip() != u"" else u""
+        quoter = self.quoter if self.quoter and self.quoter.strip() != u"" else u""
         return (u"%s %s | %s | %s" % (self.timestamp.strftime("%F_%T"), config.quote_template % self.__dict__
                   , place, quoter)).encode("utf-8")