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

all browser2 modules may import exceptions from weboob.tools.exceptions

Browse source
This commit is contained in:
Romain Bignon 2014-05-17 13:58:33 +02:00
commit e434bb90e2
14 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/alloresto/browser.py
View file

@ -19,7 +19,7 @@
from weboob.tools.browser2 import LoginBrowser, URL, need_login from weboob.tools.browser2 import LoginBrowser, URL, need_login
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from .pages import LoginPage, AccountsPage from .pages import LoginPage, AccountsPage

2
modules/banqueaccord/browser.py
View file

@ -19,7 +19,7 @@
from weboob.tools.browser2 import LoginBrowser, need_login, URL from weboob.tools.browser2 import LoginBrowser, need_login, URL
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from .pages import LoginPage, IndexPage, AccountsPage, OperationsPage from .pages import LoginPage, IndexPage, AccountsPage, OperationsPage

2
modules/carrefourbanque/browser.py
View file

@ -19,7 +19,7 @@
from weboob.tools.browser2 import LoginBrowser, URL, need_login from weboob.tools.browser2 import LoginBrowser, URL, need_login
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from .pages import LoginPage, HomePage, TransactionsPage from .pages import LoginPage, HomePage, TransactionsPage

10
modules/cmb/backend.py
View file

@ -22,7 +22,7 @@ from weboob.capabilities.bank import Account, Transaction
from weboob.tools.backend import BaseBackend, BackendConfig from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.value import ValueBackendPassword from weboob.tools.value import ValueBackendPassword
from weboob.capabilities.base import NotAvailable from weboob.capabilities.base import NotAvailable
from weboob.tools.browser import BrowserIncorrectPassword, BrokenPageError from weboob.tools.exceptions import BrowserIncorrectPassword, ParseError
from weboob.tools.browser2 import BaseBrowser from weboob.tools.browser2 import BaseBrowser
from re import match, compile, sub from re import match, compile, sub
@ -124,9 +124,9 @@ class CmbBackend(BaseBackend, ICapBank):
tree = etree.parse(StringIO(data), parser) tree = etree.parse(StringIO(data), parser)
table = tree.xpath('/html/body/table') table = tree.xpath('/html/body/table')
if len(table) == 0: if len(table) == 0:
raise BrokenPageError() raise ParseError()
else: else:
raise BrokenPageError() raise ParseError()
for tr in tree.xpath('/html/body//table[contains(@class, "Tb")]/tr'): for tr in tree.xpath('/html/body//table[contains(@class, "Tb")]/tr'):
if tr.get('class', None) not in ('LnTit', 'LnTot', 'LnMnTiers', None): if tr.get('class', None) not in ('LnTit', 'LnTot', 'LnMnTiers', None):
@ -196,9 +196,9 @@ class CmbBackend(BaseBackend, ICapBank):
tree = etree.parse(StringIO(data), parser) tree = etree.parse(StringIO(data), parser)
tables = tree.xpath('/html/body/table') tables = tree.xpath('/html/body/table')
if len(tables) == 0: if len(tables) == 0:
raise BrokenPageError() raise ParseError()
else: else:
raise BrokenPageError() raise ParseError()
i = 0 i = 0

2
modules/freemobile/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser2 import LoginBrowser, URL, need_login from weboob.tools.browser2 import LoginBrowser, URL, need_login
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from .pages import HomePage, LoginPage, HistoryPage, DetailsPage from .pages import HomePage, LoginPage, HistoryPage, DetailsPage
__all__ = ['Freemobile'] __all__ = ['Freemobile']

2
modules/groupamaes/browser.py
View file

@ -19,7 +19,7 @@
from weboob.tools.browser2 import LoginBrowser, URL, need_login from weboob.tools.browser2 import LoginBrowser, URL, need_login
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from .pages import LoginPage, LoginErrorPage, AvoirPage, OperationsTraiteesPage, OperationsFuturesPage from .pages import LoginPage, LoginErrorPage, AvoirPage, OperationsTraiteesPage, OperationsFuturesPage

2
modules/hsbc/browser.py
View file

@ -22,7 +22,7 @@ import ssl
from datetime import timedelta from datetime import timedelta
from weboob.tools.date import LinearDateGuesser from weboob.tools.date import LinearDateGuesser
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from weboob.tools.browser2 import LoginBrowser, URL, need_login from weboob.tools.browser2 import LoginBrowser, URL, need_login
from .pages import AccountsPage, CBOperationPage, CPTOperationPage, LoginPage from .pages import AccountsPage, CBOperationPage, CPTOperationPage, LoginPage

2
modules/hsbc/pages.py
View file

@ -24,7 +24,7 @@ from weboob.capabilities import NotAvailable
from weboob.capabilities.bank import Account from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.capabilities.bank.transactions import FrenchTransaction
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, SkipItem, LoggedPage, pagination from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, SkipItem, LoggedPage, pagination
from weboob.tools.browser2.filters import Filter, Env, CleanText, CleanDecimal, Link, Field, DateGuesser, TableCell from weboob.tools.browser2.filters import Filter, Env, CleanText, CleanDecimal, Link, Field, DateGuesser, TableCell

4
modules/ing/browser.py
View file

@ -19,7 +19,7 @@
import hashlib import hashlib
from weboob.tools.browser2 import LoginBrowser, URL, need_login from weboob.tools.browser2 import LoginBrowser, URL, need_login
from weboob.tools.browser import BrowserIncorrectPassword, BrokenPageError from weboob.tools.exceptions import BrowserIncorrectPassword, ParseError
from weboob.capabilities.bank import Account, TransferError from weboob.capabilities.bank import Account, TransferError
from .pages import AccountsList, LoginPage, TitrePage, TitreHistory,\ from .pages import AccountsList, LoginPage, TitrePage, TitreHistory,\
@ -162,7 +162,7 @@ class IngBrowser(LoginBrowser):
self.valtransferpage.go() self.valtransferpage.go()
recap = self.page.recap() recap = self.page.recap()
if len(list(recap)) == 0: if len(list(recap)) == 0:
raise BrokenPageError('Unable to find confirmation') raise ParseError('Unable to find confirmation')
return self.page.recap() return self.page.recap()
else: else:
raise TransferError('Recipient not found') raise TransferError('Recipient not found')

4
modules/ing/pages/login.py
View file

@ -19,7 +19,7 @@
from StringIO import StringIO from StringIO import StringIO
from weboob.tools.browser import BasePage, BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from weboob.tools.captcha.virtkeyboard import VirtKeyboard from weboob.tools.captcha.virtkeyboard import VirtKeyboard
from weboob.tools.browser2.page import HTMLPage from weboob.tools.browser2.page import HTMLPage
@ -120,5 +120,5 @@ class LoginPage(HTMLPage):
form.submit() form.submit()
class StopPage(BasePage): class StopPage(HTMLPage):
pass pass

3
modules/poivy/browser.py
View file

@ -18,9 +18,10 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser2 import LoginBrowser, URL, need_login from weboob.tools.browser2 import LoginBrowser, URL, need_login
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from .pages import HomePage, LoginPage, HistoryPage, BillsPage, ErrorPage from .pages import HomePage, LoginPage, HistoryPage, BillsPage, ErrorPage
__all__ = ['PoivyBrowser'] __all__ = ['PoivyBrowser']

2
modules/poivy/pages.py
View file

@ -17,7 +17,7 @@
# 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 weboob.tools.browser import BrowserBanned from weboob.tools.exceptions import BrowserBanned
from weboob.tools.browser2.page import HTMLPage, LoggedPage, method, ListElement, ItemElement, pagination from weboob.tools.browser2.page import HTMLPage, LoggedPage, method, ListElement, ItemElement, pagination
from weboob.tools.browser2.filters import CleanText, CleanDecimal, Field, Attr, DateTime, Link, Format from weboob.tools.browser2.filters import CleanText, CleanDecimal, Field, Attr, DateTime, Link, Format
from weboob.capabilities.bill import Subscription, Detail from weboob.capabilities.bill import Subscription, Detail

2
modules/redmine/backend.py
View file

@ -26,7 +26,7 @@ from weboob.capabilities.bugtracker import ICapBugTracker, Issue, Project, User,
Query, Change Query, Change
from weboob.capabilities.collection import ICapCollection, Collection, CollectionNotFound from weboob.capabilities.collection import ICapCollection, Collection, CollectionNotFound
from weboob.tools.backend import BaseBackend, BackendConfig from weboob.tools.backend import BaseBackend, BackendConfig
from weboob.tools.browser import BrowserHTTPNotFound from weboob.tools.exceptions import BrowserHTTPNotFound
from weboob.tools.value import ValueBackendPassword, Value from weboob.tools.value import ValueBackendPassword, Value
from .browser import RedmineBrowser from .browser import RedmineBrowser

2
modules/tinder/browser.py
View file

@ -21,7 +21,7 @@
import re import re
from weboob.tools.browser2 import DomainBrowser, HTMLPage, Profile from weboob.tools.browser2 import DomainBrowser, HTMLPage, Profile
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.exceptions import BrowserIncorrectPassword
from weboob.tools.json import json from weboob.tools.json import json