From 812c597f34ecec7bdac13fb8f76802634a36f99e Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sat, 27 Mar 2010 11:42:54 +0100 Subject: [PATCH] minor fixes --- weboob/backends/dlfp/backend.py | 2 +- weboob/capabilities/messages.py | 12 ++++++------ weboob/frontends/mail/scripts/mail | 1 - weboob/frontends/travel/application.py | 5 ----- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/weboob/backends/dlfp/backend.py b/weboob/backends/dlfp/backend.py index f39223bb3c..eb3b84a730 100644 --- a/weboob/backends/dlfp/backend.py +++ b/weboob/backends/dlfp/backend.py @@ -34,5 +34,5 @@ def __init__(self, weboob): def iter_messages(self): articles_list = ArticlesList('newspaper') for article in articles_list.iter_articles(): - yield Message('threadid', article._id, article.title, article.author, signature='Bite bite bite bite', + yield Message('threadid', article.id, article.title, article.author, signature='Bite bite bite bite', content='Content content\nContent content.') diff --git a/weboob/capabilities/messages.py b/weboob/capabilities/messages.py index f48f06cb54..e4b7bb7076 100644 --- a/weboob/capabilities/messages.py +++ b/weboob/capabilities/messages.py @@ -24,7 +24,7 @@ class Message: def __init__(self, thread_id, _id, title, sender, date=None, reply_id=u'', content=u'', signature=u''): self.thread_id = unicode(thread_id) - self._id = unicode(_id) + self.id = unicode(_id) self.reply_id = unicode(reply_id) self.title = unicode(title) self.sender = unicode(sender) @@ -40,13 +40,13 @@ def get_date_int(self): return int(time.strftime('%Y%m%d%H%M%S', self.get_date().timetuple())) def get_full_id(self): - return '%s.%s' % (self._id, self.thread_id) + return '%s.%s' % (self.id, self.thread_id) def get_full_reply_id(self): return '%s.%s' % (self.reply_id, self.thread_id) def get_id(self): - return self._id + return self.id def get_thread_id(self): return self.thread_id @@ -72,9 +72,9 @@ def get_signature(self): def is_new(self): return self.new - def __str__(self): - result = '' % ( - self.title, self.date, self.sender, self.content) + def __repr__(self): + result = '' % ( + self.id, self.title, self.date, self.sender) return result.encode('utf-8') class ICapMessages: diff --git a/weboob/frontends/mail/scripts/mail b/weboob/frontends/mail/scripts/mail index c71588a45c..330a2342b2 100755 --- a/weboob/frontends/mail/scripts/mail +++ b/weboob/frontends/mail/scripts/mail @@ -47,7 +47,6 @@ class Application(BaseApplication): self.weboob.load_modules(ICapMessages) self.weboob.schedule(self.config['interval'], self.process) - self.weboob.config.save() self.weboob.loop() def process(self): diff --git a/weboob/frontends/travel/application.py b/weboob/frontends/travel/application.py index da5124d418..ffbc75f804 100644 --- a/weboob/frontends/travel/application.py +++ b/weboob/frontends/travel/application.py @@ -32,11 +32,6 @@ class Application(BaseApplication): CONFIG = {} def main(self, argv): - #if not self.config: - # print >>sys.stderr, "Error: %s is not configured yet. Please call 'weboob.travel -c'" % argv[0] - # print >>sys.stderr, "Also, you need to use 'weboobcfg' to set backend configs" - # return -1 - self.weboob.load_modules(ICapTravel) if len(argv) == 1: -- GitLab