From f73f671cbe2bd64062dd0ec9376f2585c4e6c378 Mon Sep 17 00:00:00 2001 From: Kitof Date: Wed, 18 Feb 2015 14:45:39 +0100 Subject: [PATCH] Fix permissions, encoding and copyrights --- modules/amazon/browser.py | 0 modules/amazon/fr/pages.py | 13 +++++-------- modules/amazon/module.py | 2 +- modules/ameli/__init__.py | 2 +- modules/ameli/browser.py | 2 +- modules/ameli/module.py | 2 +- modules/ameli/pages.py | 2 +- modules/ameli/test.py | 2 +- modules/amelipro/__init__.py | 2 +- modules/amelipro/browser.py | 2 +- modules/amelipro/module.py | 2 +- modules/amelipro/pages.py | 2 +- modules/amelipro/test.py | 2 +- modules/hellobank/__init__.py | 1 + modules/hellobank/browser.py | 4 ++-- modules/hellobank/module.py | 4 ++-- modules/hellobank/test.py | 3 ++- scripts/shopoob | 2 +- weboob/applications/shopoob/shopoob.py | 14 +++++--------- 19 files changed, 29 insertions(+), 34 deletions(-) mode change 100755 => 100644 modules/amazon/browser.py mode change 100755 => 100644 modules/amazon/fr/pages.py mode change 100755 => 100644 modules/amazon/module.py mode change 100755 => 100644 modules/ameli/browser.py diff --git a/modules/amazon/browser.py b/modules/amazon/browser.py old mode 100755 new mode 100644 diff --git a/modules/amazon/fr/pages.py b/modules/amazon/fr/pages.py old mode 100755 new mode 100644 index 223a5c24..1f05c928 --- a/modules/amazon/fr/pages.py +++ b/modules/amazon/fr/pages.py @@ -1,6 +1,6 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- -# Copyright(C) 2014 Oleg Plakhotniuk +# Copyright(C) 2015 Christophe Lampin # # This file is part of weboob. # @@ -91,7 +91,7 @@ class OrderPage(AmazonPage): m = re.match(u'.*EUR ([,0-9]+).*', amount) if m: return Decimal(m.group(1).replace(",",".")) - + def month_to_int(self, text): for (idx, month) in enumerate(FRENCH_MONTHS): text = text.replace(month, str(idx + 1)) @@ -102,9 +102,6 @@ class OrderNewPage(OrderPage): ENCODING='ISO-8859-15' is_here = u'//*[contains(text(),"Commandé le")]' -# def text(self): -# return self.response.text.decode('iso-8859-1').encode('utf-8') - def order(self): if not self.shouldSkip(): order = Order(id=self.order_number()) @@ -116,7 +113,7 @@ class OrderNewPage(OrderPage): return order def order_date(self): - return datetime.strptime( + return datetime.strptime( re.match(u'.*Commandé le ([0-9]+ [0-9]+ [0-9]+) .*', self.month_to_int(self.date_num())).group(1), '%d %m %Y') @@ -245,7 +242,7 @@ class OrderOldPage(OrderPage): def order_date(self): date_str = self.doc.xpath(u'//b[contains(text(),"Commande numérique")]')[0].text month_str = re.match(u'.*Commande numérique : [0-9]+ ([^ ]+) [0-9]+.*', date_str).group(1) - return datetime.strptime( + return datetime.strptime( re.match(u'.*Commande numérique : ([0-9]+ [0-9]+ [0-9]+).*', date_str.replace(month_str, str(FRENCH_MONTHS.index(month_str) + 1))).group(1), '%d %m %Y') diff --git a/modules/amazon/module.py b/modules/amazon/module.py old mode 100755 new mode 100644 index 19ad866b..8aac4e48 --- a/modules/amazon/module.py +++ b/modules/amazon/module.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- # Copyright(C) 2014 Oleg Plakhotniuk # diff --git a/modules/ameli/__init__.py b/modules/ameli/__init__.py index 4a75134e..c679cf0a 100644 --- a/modules/ameli/__init__.py +++ b/modules/ameli/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/ameli/browser.py b/modules/ameli/browser.py old mode 100755 new mode 100644 index 956976ea..6af53456 --- a/modules/ameli/browser.py +++ b/modules/ameli/browser.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/ameli/module.py b/modules/ameli/module.py index 561aa025..8671e627 100755 --- a/modules/ameli/module.py +++ b/modules/ameli/module.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/ameli/pages.py b/modules/ameli/pages.py index 8dd3cce3..14c14047 100644 --- a/modules/ameli/pages.py +++ b/modules/ameli/pages.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/ameli/test.py b/modules/ameli/test.py index 7b08ee84..80de9958 100644 --- a/modules/ameli/test.py +++ b/modules/ameli/test.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/amelipro/__init__.py b/modules/amelipro/__init__.py index 8014e86b..e847285b 100644 --- a/modules/amelipro/__init__.py +++ b/modules/amelipro/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/amelipro/browser.py b/modules/amelipro/browser.py index ec1887f8..20cda994 100755 --- a/modules/amelipro/browser.py +++ b/modules/amelipro/browser.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/amelipro/module.py b/modules/amelipro/module.py index f55dacbe..739ef64f 100755 --- a/modules/amelipro/module.py +++ b/modules/amelipro/module.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/amelipro/pages.py b/modules/amelipro/pages.py index b60df9d1..64602411 100755 --- a/modules/amelipro/pages.py +++ b/modules/amelipro/pages.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/amelipro/test.py b/modules/amelipro/test.py index 9b2bdccf..3ab80696 100644 --- a/modules/amelipro/test.py +++ b/modules/amelipro/test.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/hellobank/__init__.py b/modules/hellobank/__init__.py index 8501ea1d..619ae452 100644 --- a/modules/hellobank/__init__.py +++ b/modules/hellobank/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Copyright(C) 2010-2011 Romain Bignon +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/hellobank/browser.py b/modules/hellobank/browser.py index e1aa66f6..df715ed0 100644 --- a/modules/hellobank/browser.py +++ b/modules/hellobank/browser.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin -# Copyright(C) 2009-2013 Romain Bignon +# Copyright(C) 2009-2012 Romain Bignon +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/modules/hellobank/module.py b/modules/hellobank/module.py index 52938641..54e21d12 100644 --- a/modules/hellobank/module.py +++ b/modules/hellobank/module.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2010-2012 Romain Bignon -# +# Copyright(C) 2013-2015 Christophe Lampin + # This file is part of weboob. # # weboob is free software: you can redistribute it and/or modify diff --git a/modules/hellobank/test.py b/modules/hellobank/test.py index d4daf1f2..182c9524 100644 --- a/modules/hellobank/test.py +++ b/modules/hellobank/test.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2010-2011 Romain Bignon +# Copyright(C) 2010-2012 Romain Bignon +# Copyright(C) 2013-2015 Christophe Lampin # # This file is part of weboob. # diff --git a/scripts/shopoob b/scripts/shopoob index ec4e8a21..3715dd03 100755 --- a/scripts/shopoob +++ b/scripts/shopoob @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # vim: ft=python et softtabstop=4 cinoptions=4 shiftwidth=4 ts=4 ai -# Copyright(C) 2012 Fourcot Florent +# Copyright(C) 2015 Christophe Lampin # # This file is part of weboob. # diff --git a/weboob/applications/shopoob/shopoob.py b/weboob/applications/shopoob/shopoob.py index 24d55de6..e2c26538 100755 --- a/weboob/applications/shopoob/shopoob.py +++ b/weboob/applications/shopoob/shopoob.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2012-2013 Florent Fourcot +# Copyright(C) 2015 Christophe Lampin # # This file is part of weboob. # @@ -22,11 +22,9 @@ from __future__ import print_function from decimal import Decimal from weboob.capabilities.base import empty -from weboob.capabilities.shop import CapShop, Order, Payment, Item +from weboob.capabilities.shop import CapShop, Order, Item from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import PrettyFormatter, IFormatter -from weboob.tools.application.base import MoreResultsAvailable -from weboob.core import CallErrors +from weboob.tools.application.formatters.iformatter import IFormatter __all__ = ['Shopoob'] @@ -92,7 +90,7 @@ class PaymentsFormatter(IFormatter): def flush(self): self.output(u'-----------+-----------------+----------') - + class Shopoob(ReplApplication): APPNAME = 'shopoob' VERSION = '1.1' @@ -145,9 +143,7 @@ class Shopoob(ReplApplication): for id, backend in l: names = (backend,) if backend is not None else None - # XXX: should be generated by backend? -Flo - # XXX: no, but you should do it in a specific formatter -romain - # TODO: do it, and use exec_method here. Code is obsolete + # TODO: Use specific formatter mysum = Item() mysum.label = u"Sum" mysum.url = u"Generated by shopoob"