Merge branch 'master' into qa

* master:
  bump dev version number after some PR merges
  bugfix for BrozzlerWorker._needs_browsing
  Remove redundant method parameter.
  bugfix
  Make youtube-dl optional in BrozzlerWorker.brozzle_page
This commit is contained in:
Noah Levitt 2017-08-01 12:05:07 -07:00
commit 5be7dd4407
3 changed files with 43 additions and 35 deletions

View file

@ -376,7 +376,7 @@ class Browser:
return self.websock_url is not None
def browse_page(
self, page_url, ignore_cert_errors=False, extra_headers=None,
self, page_url, extra_headers=None,
user_agent=None, behavior_parameters=None,
on_request=None, on_response=None, on_screenshot=None,
username=None, password=None, hashtags=None,