Merge branch 'master' into qa

* master:
  adapt to exception message from newer versions of chromium (e.g. 57.0.2981.0)
This commit is contained in:
Noah Levitt 2017-01-13 12:08:09 -08:00
commit 58bac8fc83
2 changed files with 2 additions and 1 deletions

View File

@ -553,6 +553,7 @@ class Browser:
timeout=5)
msg = self.websock_thread.pop_result(msg_id)
if (msg and 'result' in msg
and not ('exceptionDetails' in msg['result'])
and not ('wasThrown' in msg['result']
and msg['result']['wasThrown'])
and 'result' in msg['result']

View File

@ -32,7 +32,7 @@ def find_package_data(package):
setuptools.setup(
name='brozzler',
version='1.1b9.dev167',
version='1.1b9.dev168',
description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler',
author='Noah Levitt',