Merge branch 'master' into qa

* master:
  fix TypeError: not all arguments converted during string formatting
This commit is contained in:
Noah Levitt 2017-02-03 17:24:53 -08:00
commit aa22594928
2 changed files with 2 additions and 3 deletions

View File

@ -200,8 +200,7 @@ class WebsockReceiverThread(threading.Thread):
else:
self.logger.info(
'reached limit but self.reached_limit is already set, '
'assuming the calling thread is already handling this',
self.reached_limit)
'assuming the calling thread is already handling this')
if self.on_response:
self.on_response(message)

View File

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