From 683979a8390c17cb7b4bd6a389f31bb183d7da0b Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Tue, 11 May 2010 16:59:48 +0200 Subject: [PATCH] use logging instead of printing to stderr --- weboob/frontends/havesex/application.py | 8 +++++++- weboob/frontends/weboobcfg/application.py | 13 +++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/weboob/frontends/havesex/application.py b/weboob/frontends/havesex/application.py index 66ce1fb1..8680532a 100644 --- a/weboob/frontends/havesex/application.py +++ b/weboob/frontends/havesex/application.py @@ -20,10 +20,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from __future__ import with_statement +import logging import sys + from weboob.tools.application import PromptApplication from weboob.capabilities.dating import ICapDating + +__all__ = ['HaveSex'] + + class HaveSex(PromptApplication): APPNAME = 'havesex' VERSION = '1.0' @@ -77,4 +83,4 @@ class HaveSex(PromptApplication): elif action == 'stop': self.service('Stopping walker', 'stop_profiles_walker') else: - print >>sys.stderr, 'Syntax: walker (start|stop)' + logging.error(u'Syntax: walker (start|stop)') diff --git a/weboob/frontends/weboobcfg/application.py b/weboob/frontends/weboobcfg/application.py index 4d0d50a3..900ddb28 100644 --- a/weboob/frontends/weboobcfg/application.py +++ b/weboob/frontends/weboobcfg/application.py @@ -19,12 +19,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ import ConfigParser +import logging import os import sys import weboob from weboob.tools.application import ConsoleApplication + +__all__ = ['WeboobCfg'] + + class WeboobCfg(ConsoleApplication): APPNAME = 'weboobcfg' VERSION = '1.0' @@ -70,7 +75,7 @@ class WeboobCfg(ConsoleApplication): try: module = self.weboob.modules_loader.get_or_load_module(name) except KeyError: - print >>sys.stderr, 'No such module: %s' % name + logging.error('No such module: %s' % name) return 1 print '.------------------------------------------------------------------------------.' @@ -105,14 +110,14 @@ class WeboobCfg(ConsoleApplication): try: key, value = param.split('=', 1) except ValueError: - print >>sys.stderr, "Parameters have to be in form 'key=value'" + logging.error("Parameters have to be in form 'key=value'") return 1 params[key] = value try: self.weboob.backends_config.add_backend(name, type, params) except ConfigParser.DuplicateSectionError, e: - print >>sys.stderr, 'Error: %s (filename=%s)' % (e, self.weboob.backends_config.confpath) + logging.error('Error: %s (filename=%s)' % (e, self.weboob.backends_config.confpath)) return 1 @ConsoleApplication.command('List backends') @@ -129,5 +134,5 @@ class WeboobCfg(ConsoleApplication): try: self.weboob.backends_config.remove_backend(name) except ConfigParser.NoSectionError: - print >>sys.stderr, "Backend '%s' does not exist" % name + logging.error("Backend '%s' does not exist" % name) return 1