change Browser API to specify parser instance
This commit is contained in:
parent
a39b7904b1
commit
57e233cf3b
1 changed files with 2 additions and 5 deletions
|
|
@ -110,7 +110,7 @@ class Browser(mechanize.Browser):
|
||||||
|
|
||||||
# ------ Browser methods ---------------------------------------
|
# ------ Browser methods ---------------------------------------
|
||||||
|
|
||||||
def __init__(self, username=None, password=None, firefox_cookies=None, parser=StandardParser):
|
def __init__(self, username=None, password=None, firefox_cookies=None, parser=StandardParser()):
|
||||||
mechanize.Browser.__init__(self)#, history=NoHistory())
|
mechanize.Browser.__init__(self)#, history=NoHistory())
|
||||||
self.addheaders = [
|
self.addheaders = [
|
||||||
['User-agent', self.USER_AGENT]
|
['User-agent', self.USER_AGENT]
|
||||||
|
|
@ -124,7 +124,7 @@ class Browser(mechanize.Browser):
|
||||||
else:
|
else:
|
||||||
self.__cookie = None
|
self.__cookie = None
|
||||||
|
|
||||||
self.__parser = parser()
|
self.__parser = parser
|
||||||
self.page = None
|
self.page = None
|
||||||
self.last_update = 0.0
|
self.last_update = 0.0
|
||||||
self.username = username
|
self.username = username
|
||||||
|
|
@ -135,9 +135,6 @@ class Browser(mechanize.Browser):
|
||||||
except BrowserUnavailable:
|
except BrowserUnavailable:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def set_parser(self, parser):
|
|
||||||
self.__parser = parser
|
|
||||||
|
|
||||||
def pageaccess(func):
|
def pageaccess(func):
|
||||||
def inner(self, *args, **kwargs):
|
def inner(self, *args, **kwargs):
|
||||||
if not self.page or self.password and not self.page.is_logged():
|
if not self.page or self.password and not self.page.is_logged():
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue