unify no_login and nologin

This commit is contained in:
Romain Bignon 2014-02-16 19:14:43 +01:00
commit 2147c4b363

View file

@ -554,9 +554,9 @@ class BaseBrowser(StandardBrowser):
"""
Submit the selected form.
"""
nologin = kwargs.pop('nologin', False)
no_login = kwargs.pop('nologin', kwargs.pop('no_login', False))
try:
self._change_location(mechanize.Browser.submit(self, *args, **kwargs), no_login=nologin)
self._change_location(mechanize.Browser.submit(self, *args, **kwargs), no_login=no_login)
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError, BadStatusLine, ssl.SSLError) as e:
self.page = None
raise self.get_exception(e)(e)
@ -615,7 +615,7 @@ class BaseBrowser(StandardBrowser):
keep_args = copy(args)
keep_kwargs = kwargs.copy()
no_login = kwargs.pop('no_login', False)
no_login = kwargs.pop('no_login', kwargs.pop('nologin', False))
kwargs['timeout'] = kwargs.get('timeout', self.DEFAULT_TIMEOUT)
try: