nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pyflakes fixes

Browse source
This commit is contained in:
Romain Bignon 2013-05-14 10:37:54 +02:00
commit 3b2fb9cfbd
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/gdfsuez/backend.py
View file

@ -51,7 +51,7 @@ class GdfSuezBackend(BaseBackend, ICapBill):
def get_subscription(self, _id): def get_subscription(self, _id):
if not _id.isdigit(): if not _id.isdigit():
raise SubscriptionnotFound() raise SubscriptionNotFound()
with self.browser: with self.browser:
subscription = self.browser.get_subscription(_id) subscription = self.browser.get_subscription(_id)
if not subscription: if not subscription:
@ -65,7 +65,7 @@ class GdfSuezBackend(BaseBackend, ICapBill):
with self.browser: with self.browser:
for history in self.browser.get_history(subscription): for history in self.browser.get_history(subscription):
yield history yield history
def get_details(self, subscription): def get_details(self, subscription):
if not isinstance(subscription, Subscription): if not isinstance(subscription, Subscription):
subscription = self.get_subscription(subscription) subscription = self.get_subscription(subscription)

4
modules/gdfsuez/browser.py
View file

@ -44,11 +44,11 @@ class GdfSuez(BaseBrowser):
def home(self): def home(self):
self.location(self.homep) self.location(self.homep)
def is_logged(self): def is_logged(self):
if self.is_on_page(LoginPage) or self.is_on_page(TimeoutPage): if self.is_on_page(LoginPage) or self.is_on_page(TimeoutPage):
return False return False
return True return True
def login(self): def login(self):
assert isinstance(self.username, basestring) assert isinstance(self.username, basestring)
assert isinstance(self.password, basestring) assert isinstance(self.password, basestring)

8
modules/gdfsuez/pages/history.py
View file

@ -23,7 +23,7 @@ import subprocess
import tempfile import tempfile
import shutil import shutil
from datetime import datetime, date from datetime import date
from decimal import Decimal from decimal import Decimal
from weboob.tools.browser import BasePage from weboob.tools.browser import BasePage
@ -60,14 +60,14 @@ class HistoryPage(BasePage):
def _create_bill(self, date, price, link): def _create_bill(self, date, price, link):
bill = Bill() bill = Bill()
bill.id = date.__str__().replace('-', '') bill.id = date.__str__().replace('-', '')
bill.date = date bill.date = date
bill._price = price bill._price = price
bill._url = link bill._url = link
bill.format = u'pdf' bill.format = u'pdf'
bill.label = unicode(price) bill.label = unicode(price)
return bill return bill
def get_details(self): def get_details(self):
return self.details return self.details
@ -100,10 +100,8 @@ class PdfPage():
footnote = re.compile(r'\([0-9]\) ') # (f) footnote = re.compile(r'\([0-9]\) ') # (f)
ht = re.compile('HT par mois') ht = re.compile('HT par mois')
base = re.compile('la base de') base = re.compile('la base de')
begindate = re.compile(' \d\d\/\d\d ') # MM/DD
enddate = re.compile('\d\d\/\d\d\/\d\d') # YY/MM/DD enddate = re.compile('\d\d\/\d\d\/\d\d') # YY/MM/DD
endwithdigit = re.compile('\d+$') # blah blah 42 endwithdigit = re.compile('\d+$') # blah blah 42
endwitheuro = re.compile('€$') # blah 00,00 €
textwithcoma = re.compile('([a-z]|\d{4})\,') # blah 2012, blah blah textwithcoma = re.compile('([a-z]|\d{4})\,') # blah 2012, blah blah
# Parsing # Parsing

3
modules/gdfsuez/pages/homepage.py
View file

@ -17,10 +17,9 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from datetime import datetime, date from datetime import date
from weboob.tools.browser import BasePage from weboob.tools.browser import BasePage
from weboob.tools.mech import ClientForm
from weboob.capabilities.bill import Subscription from weboob.capabilities.bill import Subscription
__all__ = ['LoginPage', 'HomePage', 'AccountPage', 'TimeoutPage'] __all__ = ['LoginPage', 'HomePage', 'AccountPage', 'TimeoutPage']