From 3a66728392e4961837e7a53fe3dcd89754cc0f78 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Wed, 24 Oct 2012 13:29:30 +0200 Subject: [PATCH] Fix crashes with unicode characters in maintainer name Change every mention of MAINTAINER to avoid future issues. --- docs/source/guides/module.rst | 2 +- modules/arte/backend.py | 2 +- modules/aum/backend.py | 2 +- modules/banquepopulaire/backend.py | 2 +- modules/bnporc/backend.py | 2 +- modules/boursorama/backend.py | 2 +- modules/bouygues/backend.py | 2 +- modules/bp/backend.py | 2 +- modules/bred/backend.py | 2 +- modules/caissedepargne/backend.py | 2 +- modules/canalplus/backend.py | 2 +- modules/canaltp/backend.py | 2 +- modules/cappedtv/backend.py | 2 +- modules/cic/backend.py | 2 +- modules/cmb/backend.py | 2 +- modules/cragr/backend.py | 2 +- modules/creditmutuel/backend.py | 2 +- modules/dailymotion/backend.py | 2 +- modules/dlfp/backend.py | 2 +- modules/ebonics/backend.py | 2 +- modules/ecrans/backend.py | 2 +- modules/ehentai/backend.py | 2 +- modules/fortuneo/backend.py | 2 +- modules/fourchan/backend.py | 2 +- modules/francetelevisions/backend.py | 2 +- modules/freemobile/backend.py | 2 +- modules/gazelle/backend.py | 2 +- modules/geolocip/backend.py | 2 +- modules/googletranslate/backend.py | 2 +- modules/hds/backend.py | 2 +- modules/hsbc/backend.py | 2 +- modules/ina/backend.py | 2 +- modules/ing/backend.py | 2 +- modules/inrocks/backend.py | 2 +- modules/ipinfodb/backend.py | 2 +- modules/isohunt/backend.py | 2 +- modules/izneo/backend.py | 2 +- modules/kickass/backend.py | 2 +- modules/leclercmobile/backend.py | 2 +- modules/lefigaro/backend.py | 2 +- modules/meteofrance/backend.py | 2 +- modules/minutes20/backend.py | 2 +- modules/nettokom/backend.py | 2 +- modules/newsfeed/backend.py | 2 +- modules/nolifetv/backend.py | 2 +- modules/nova/backend.py | 2 +- modules/okc/backend.py | 2 +- modules/orange/backend.py | 2 +- modules/ouifm/backend.py | 2 +- modules/pastealacon/backend.py | 2 +- modules/pastebin/backend.py | 2 +- modules/phpbb/backend.py | 2 +- modules/piratebay/backend.py | 2 +- modules/presseurop/backend.py | 2 +- modules/radiofrance/backend.py | 2 +- modules/redmine/backend.py | 2 +- modules/sachsen/backend.py | 2 +- modules/sfr/backend.py | 2 +- modules/societegenerale/backend.py | 2 +- modules/taz/backend.py | 2 +- modules/trictractv/backend.py | 2 +- modules/weather/backend.py | 2 +- modules/wordreference/backend.py | 2 +- modules/yahoo/backend.py | 2 +- modules/youjizz/backend.py | 2 +- modules/youporn/backend.py | 2 +- modules/youtube/backend.py | 2 +- weboob/core/modules.py | 2 +- weboob/tools/application/qt/qt.py | 4 ++-- weboob/tools/backend.py | 2 +- weboob/tools/capabilities/gallery/genericcomicreader.py | 2 +- weboob/tools/capabilities/messages/GenericBackend.py | 2 +- 72 files changed, 73 insertions(+), 73 deletions(-) diff --git a/docs/source/guides/module.rst b/docs/source/guides/module.rst index d8b598e798..a73ccc226a 100644 --- a/docs/source/guides/module.rst +++ b/docs/source/guides/module.rst @@ -85,7 +85,7 @@ Then, you can edit ``backend.py`` and create your :class:`BaseBackend ' % (self.klass.MAINTAINER, self.klass.EMAIL) + return u'%s <%s>' % (self.klass.MAINTAINER, self.klass.EMAIL) @property def version(self): diff --git a/weboob/tools/application/qt/qt.py b/weboob/tools/application/qt/qt.py index 24bbf59743..1a75df157a 100644 --- a/weboob/tools/application/qt/qt.py +++ b/weboob/tools/application/qt/qt.py @@ -176,8 +176,8 @@ def default_eb(self, backend, error, backtrace): if not msg: msg = 'Website is unavailable.' elif isinstance(error, NotImplementedError): - msg = 'This feature is not supported by this backend.\n\n' \ - 'To help the maintainer of this backend implement this feature, please contact: %s <%s>' % (backend.MAINTAINER, backend.EMAIL) + msg = u'This feature is not supported by this backend.\n\n' \ + u'To help the maintainer of this backend implement this feature, please contact: %s <%s>' % (backend.MAINTAINER, backend.EMAIL) elif isinstance(error, UserError): if not msg: msg = type(error).__name__ diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py index 9baa4c1fa1..5b9033fd94 100644 --- a/weboob/tools/backend.py +++ b/weboob/tools/backend.py @@ -223,7 +223,7 @@ class BaseBackend(object): # Backend name. NAME = None # Name of the maintainer of this backend. - MAINTAINER = '' + MAINTAINER = u'' # Email address of the maintainer. EMAIL = '' # Version of backend (for information only). diff --git a/weboob/tools/capabilities/gallery/genericcomicreader.py b/weboob/tools/capabilities/gallery/genericcomicreader.py index 6f3a09bfff..f3b52527bb 100644 --- a/weboob/tools/capabilities/gallery/genericcomicreader.py +++ b/weboob/tools/capabilities/gallery/genericcomicreader.py @@ -66,7 +66,7 @@ def fill_image(self, image, fields): class GenericComicReaderBackend(BaseBackend, ICapGallery): NAME = 'genericcomicreader' - MAINTAINER = 'Noé Rubinstein' + MAINTAINER = u'Noé Rubinstein' EMAIL = 'noe.rubinstein@gmail.com' VERSION = '0.d' DESCRIPTION = 'Generic comic reader backend; subclasses implement specific sites' diff --git a/weboob/tools/capabilities/messages/GenericBackend.py b/weboob/tools/capabilities/messages/GenericBackend.py index d863001f3b..cb23af24fb 100644 --- a/weboob/tools/capabilities/messages/GenericBackend.py +++ b/weboob/tools/capabilities/messages/GenericBackend.py @@ -30,7 +30,7 @@ class GenericNewspaperBackend(BaseBackend, ICapMessages): """ GenericNewspaperBackend class """ - MAINTAINER = 'Julien Hebert' + MAINTAINER = u'Julien Hebert' EMAIL = 'juke@free.fr' VERSION = '0.d' LICENSE = 'AGPLv3+' -- GitLab