Fix permissions, encoding and copyrights

This commit is contained in:
Kitof 2015-02-18 14:45:39 +01:00 committed by Romain Bignon
commit f73f671cbe
19 changed files with 29 additions and 34 deletions

0
modules/amazon/browser.py Executable file → Normal file
View file

13
modules/amazon/fr/pages.py Executable file → Normal file
View file

@ -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. # This file is part of weboob.
# #
@ -91,7 +91,7 @@ class OrderPage(AmazonPage):
m = re.match(u'.*EUR ([,0-9]+).*', amount) m = re.match(u'.*EUR ([,0-9]+).*', amount)
if m: if m:
return Decimal(m.group(1).replace(",",".")) return Decimal(m.group(1).replace(",","."))
def month_to_int(self, text): def month_to_int(self, text):
for (idx, month) in enumerate(FRENCH_MONTHS): for (idx, month) in enumerate(FRENCH_MONTHS):
text = text.replace(month, str(idx + 1)) text = text.replace(month, str(idx + 1))
@ -102,9 +102,6 @@ class OrderNewPage(OrderPage):
ENCODING='ISO-8859-15' ENCODING='ISO-8859-15'
is_here = u'//*[contains(text(),"Commandé le")]' is_here = u'//*[contains(text(),"Commandé le")]'
# def text(self):
# return self.response.text.decode('iso-8859-1').encode('utf-8')
def order(self): def order(self):
if not self.shouldSkip(): if not self.shouldSkip():
order = Order(id=self.order_number()) order = Order(id=self.order_number())
@ -116,7 +113,7 @@ class OrderNewPage(OrderPage):
return order return order
def order_date(self): def order_date(self):
return datetime.strptime( return datetime.strptime(
re.match(u'.*Commandé le ([0-9]+ [0-9]+ [0-9]+) .*', re.match(u'.*Commandé le ([0-9]+ [0-9]+ [0-9]+) .*',
self.month_to_int(self.date_num())).group(1), self.month_to_int(self.date_num())).group(1),
'%d %m %Y') '%d %m %Y')
@ -245,7 +242,7 @@ class OrderOldPage(OrderPage):
def order_date(self): def order_date(self):
date_str = self.doc.xpath(u'//b[contains(text(),"Commande numérique")]')[0].text 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) 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]+).*', 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), date_str.replace(month_str, str(FRENCH_MONTHS.index(month_str) + 1))).group(1),
'%d %m %Y') '%d %m %Y')

2
modules/amazon/module.py Executable file → Normal file
View file

@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2014 Oleg Plakhotniuk # Copyright(C) 2014 Oleg Plakhotniuk
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

2
modules/ameli/browser.py Executable file → Normal file
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2010-2011 Romain Bignon # Copyright(C) 2010-2011 Romain Bignon
# Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin # Copyright(C) 2009-2012 Romain Bignon
# Copyright(C) 2009-2013 Romain Bignon # Copyright(C) 2013-2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #

View file

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2013 Christophe Lampin
# Copyright(C) 2010-2012 Romain Bignon # Copyright(C) 2010-2012 Romain Bignon
# # Copyright(C) 2013-2015 Christophe Lampin
# This file is part of weboob. # This file is part of weboob.
# #
# weboob is free software: you can redistribute it and/or modify # weboob is free software: you can redistribute it and/or modify

View file

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- 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. # This file is part of weboob.
# #

View file

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=python et softtabstop=4 cinoptions=4 shiftwidth=4 ts=4 ai # 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. # This file is part of weboob.
# #

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2012-2013 Florent Fourcot # Copyright(C) 2015 Christophe Lampin
# #
# This file is part of weboob. # This file is part of weboob.
# #
@ -22,11 +22,9 @@ from __future__ import print_function
from decimal import Decimal from decimal import Decimal
from weboob.capabilities.base import empty 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.repl import ReplApplication, defaultcount
from weboob.tools.application.formatters.iformatter import PrettyFormatter, IFormatter from weboob.tools.application.formatters.iformatter import IFormatter
from weboob.tools.application.base import MoreResultsAvailable
from weboob.core import CallErrors
__all__ = ['Shopoob'] __all__ = ['Shopoob']
@ -92,7 +90,7 @@ class PaymentsFormatter(IFormatter):
def flush(self): def flush(self):
self.output(u'-----------+-----------------+----------') self.output(u'-----------+-----------------+----------')
class Shopoob(ReplApplication): class Shopoob(ReplApplication):
APPNAME = 'shopoob' APPNAME = 'shopoob'
VERSION = '1.1' VERSION = '1.1'
@ -145,9 +143,7 @@ class Shopoob(ReplApplication):
for id, backend in l: for id, backend in l:
names = (backend,) if backend is not None else None names = (backend,) if backend is not None else None
# XXX: should be generated by backend? -Flo # TODO: Use specific formatter
# XXX: no, but you should do it in a specific formatter -romain
# TODO: do it, and use exec_method here. Code is obsolete
mysum = Item() mysum = Item()
mysum.label = u"Sum" mysum.label = u"Sum"
mysum.url = u"Generated by shopoob" mysum.url = u"Generated by shopoob"