From e0cb4118f8881208a25bb8a6a7cf34c14d7e0eb7 Mon Sep 17 00:00:00 2001 From: Bezleputh Date: Mon, 19 Jan 2015 10:24:53 +0100 Subject: [PATCH] properly define urls --- modules/agendadulibre/browser.py | 2 +- modules/explorimmo/browser.py | 2 +- modules/feedly/browser.py | 2 +- modules/hybride/browser.py | 2 +- modules/leboncoin/browser.py | 2 +- modules/logicimmo/browser.py | 2 +- modules/monster/browser.py | 2 +- modules/popolemploi/browser.py | 2 +- modules/razibus/browser.py | 2 +- modules/regionsjob/browser.py | 4 ++-- modules/twitter/browser.py | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/agendadulibre/browser.py b/modules/agendadulibre/browser.py index e7c979b7..9f44eb72 100644 --- a/modules/agendadulibre/browser.py +++ b/modules/agendadulibre/browser.py @@ -30,7 +30,7 @@ class AgendadulibreBrowser(PagesBrowser): event_page = URL('events/(?P<_id>.*)', EventPage) def __init__(self, website, region, *args, **kwargs): - self.BASEURL = u'%s' % website + self.BASEURL = u'%s/' % website self.region = '®ion=%s' % region if region else '' PagesBrowser.__init__(self, *args, **kwargs) diff --git a/modules/explorimmo/browser.py b/modules/explorimmo/browser.py index 38e2938e..4d68c860 100644 --- a/modules/explorimmo/browser.py +++ b/modules/explorimmo/browser.py @@ -24,7 +24,7 @@ from .pages import CitiesPage, SearchPage, HousingPage, HousingPage2, PhonePage class ExplorimmoBrowser(PagesBrowser): - BASEURL = 'http://www.explorimmo.com' + BASEURL = 'http://www.explorimmo.com/' cities = URL('rest/locations\?q=(?P.*)', CitiesPage) search = URL('resultat/annonces.html\?(?P.*)', SearchPage) diff --git a/modules/feedly/browser.py b/modules/feedly/browser.py index cdd4e59a..09cd09f9 100644 --- a/modules/feedly/browser.py +++ b/modules/feedly/browser.py @@ -27,7 +27,7 @@ __all__ = ['FeedlyBrowser'] class FeedlyBrowser(LoginBrowser): - BASEURL = 'http://www.feedly.com' + BASEURL = 'http://www.feedly.com/' essentials = URL('http://s3.feedly.com/essentials/essentials_fr.json', EssentialsPage) token = URL('v3/auth/token', TokenPage) diff --git a/modules/hybride/browser.py b/modules/hybride/browser.py index 0182bf5d..bf7a0ec9 100644 --- a/modules/hybride/browser.py +++ b/modules/hybride/browser.py @@ -27,7 +27,7 @@ __all__ = ['HybrideBrowser'] class HybrideBrowser(PagesBrowser): PROFILE = Firefox() - BASEURL = 'http://www.lhybride.org' + BASEURL = 'http://www.lhybride.org/' program_page = URL('programme.html', ProgramPage) event_page = URL('programme/item/(?P<_id>.*)', EventPage) diff --git a/modules/leboncoin/browser.py b/modules/leboncoin/browser.py index 3a1d1049..a4c5bff9 100644 --- a/modules/leboncoin/browser.py +++ b/modules/leboncoin/browser.py @@ -23,7 +23,7 @@ from .pages import CityListPage, HousingListPage, HousingPage class LeboncoinBrowser(PagesBrowser): - BASEURL = 'http://www.leboncoin.fr' + BASEURL = 'http://www.leboncoin.fr/' city = URL('ajax/location_list.html\?city=(?P.*)&zipcode=(?P.*)', CityListPage) search = URL('(?P.*)/offres/(?P.*)/occasions/\?ps=(?P.*)&pe=(?P.*)&ros=(?P.*)&location=(?P.*)&sqs=(?P.*)&sqe=(?P.*)&ret=(?P.*)&f=(?P.*)', '(?P<_type>.*)/offres/(?P<_region>.*)/occasions.*?', diff --git a/modules/logicimmo/browser.py b/modules/logicimmo/browser.py index 2a616cf6..668bbb39 100644 --- a/modules/logicimmo/browser.py +++ b/modules/logicimmo/browser.py @@ -24,7 +24,7 @@ from .pages import CitiesPage, SearchPage, HousingPage, PhonePage class LogicimmoBrowser(PagesBrowser): - BASEURL = 'http://www.logic-immo.com' + BASEURL = 'http://www.logic-immo.com/' city = URL('asset/t9/t9_district/fr/(?P\d*)/(?P\w)/(?P.*)\.txt\?json=%22(?P.*)%22', CitiesPage) diff --git a/modules/monster/browser.py b/modules/monster/browser.py index dfdd2084..cc46c2a8 100644 --- a/modules/monster/browser.py +++ b/modules/monster/browser.py @@ -27,7 +27,7 @@ __all__ = ['MonsterBrowser'] class MonsterBrowser(PagesBrowser): - BASEURL = 'http://offres.monster.fr' + BASEURL = 'http://offres.monster.fr/' advert = URL('http://offre-emploi.monster.fr/(?P<_id>.*).aspx', AdvertPage) search = URL('rechercher\?q=(?P.*)', 'PowerSearch.aspx\?q=(?P.*)&where=(?P.*)&jt=(?P.*)&occ=(?P.*)&tm=(?P.*)&indid=(?P)', diff --git a/modules/popolemploi/browser.py b/modules/popolemploi/browser.py index c6adb8f2..87e740ca 100644 --- a/modules/popolemploi/browser.py +++ b/modules/popolemploi/browser.py @@ -27,7 +27,7 @@ __all__ = ['PopolemploiBrowser'] class PopolemploiBrowser(PagesBrowser): - BASEURL = 'http://candidat.pole-emploi.fr' + BASEURL = 'http://candidat.pole-emploi.fr/' advert = URL('candidat/rechercheoffres/detail/(?P.*)', AdvertPage) search = URL('candidat/rechercheoffres/resultats/(?P.*?)', diff --git a/modules/razibus/browser.py b/modules/razibus/browser.py index 4242c38e..73088811 100644 --- a/modules/razibus/browser.py +++ b/modules/razibus/browser.py @@ -27,7 +27,7 @@ __all__ = ['RazibusBrowser'] class RazibusBrowser(PagesBrowser): - BASEURL = 'http://razibus.net' + BASEURL = 'http://razibus.net/' TIMEOUT = 20 event_list_page = URL('evenements-a-venir.php\?region=(?P.*)', EventListPage) event_page = URL('(?P<_id>.*).html', EventPage) diff --git a/modules/regionsjob/browser.py b/modules/regionsjob/browser.py index 4e8e41ea..2eb92a99 100644 --- a/modules/regionsjob/browser.py +++ b/modules/regionsjob/browser.py @@ -31,7 +31,7 @@ class RegionsjobBrowser(PagesBrowser): advert_page = URL('emplois/(?P<_id>.*)\.html', AdvertPage) def __init__(self, website, *args, **kwargs): - self.BASEURL = 'http://%s' % website + self.BASEURL = 'http://%s/' % website PagesBrowser.__init__(self, *args, **kwargs) def search_job(self, pattern='', fonction='', secteur='', contract='', @@ -61,5 +61,5 @@ class RegionsjobBrowser(PagesBrowser): def get_job_advert(self, _id, advert): splitted_id = _id.split('#') - self.BASEURL = 'http://www.%s.com' % splitted_id[0] + self.BASEURL = 'http://www.%s.com/' % splitted_id[0] return self.advert_page.go(_id=splitted_id[1]).get_job_advert(obj=advert) diff --git a/modules/twitter/browser.py b/modules/twitter/browser.py index 58c6c52f..5c32fa03 100644 --- a/modules/twitter/browser.py +++ b/modules/twitter/browser.py @@ -28,7 +28,7 @@ __all__ = ['TwitterBrowser'] class TwitterBrowser(LoginBrowser): - BASEURL = 'https://twitter.com' + BASEURL = 'https://twitter.com/' thread_page = URL(u'(?P.+)/status/(?P<_id>.+)', ThreadPage) login_error = URL(u'login/error.+', LoginErrorPage)