Merge branch 'master' into qa

* master:
  restore accidentally deleted line of code
This commit is contained in:
Noah Levitt 2017-03-21 13:08:24 -07:00
commit 2fda63ed9d
2 changed files with 2 additions and 1 deletions

View File

@ -225,6 +225,7 @@ class BrozzlerWorker:
try:
self.logger.info("trying youtube-dl on {}".format(page))
info = ydl.extract_info(page.url)
self._remember_videos(page, ydl.brozzler_spy)
# logging.info('XXX %s', json.dumps(info))
if self._proxy(site) and self._enable_warcprox_features(site):
info_json = json.dumps(info, sort_keys=True, indent=4)

View File

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