Merge branch 'master' into qa

* master:
  ugh, avoid infinite recursion
  fix frontier tests now that enable_warcprox_features is simply omitted by default
  i dub thee 1.1b9
  github didn't like that, how about a width in pixels
  maybe pypi supports RST image "scale"

README.rst

@@ -2,7 +2,7 @@
     :target: https://travis-ci.org/internetarchive/brozzler
 
 .. |logo| image:: https://cdn.rawgit.com/internetarchive/brozzler/1.1b5/brozzler/webconsole/static/brozzler.svg
-   :width: 7%
+   :width: 60px
 
 |logo| brozzler
 ===============

brozzler/worker.py

@@ -138,10 +138,7 @@ class BrozzlerWorker:
             return site.proxy
         return None
 
-
     def _enable_warcprox_features(self, site):
-        if not self._proxy(site):
-            return False
         if site.enable_warcprox_features is not None:
             return site.enable_warcprox_features
         else:
@@ -227,7 +224,7 @@ class BrozzlerWorker:
             info = ydl.extract_info(page.url)
             self._remember_videos(page, ydl.brozzler_spy)
             # logging.info('XXX %s', json.dumps(info))
-            if self._enable_warcprox_features(site):
+            if self._proxy(site) and self._enable_warcprox_features(site):
                 info_json = json.dumps(info, sort_keys=True, indent=4)
                 self.logger.info(
                         "sending WARCPROX_WRITE_RECORD request to warcprox "
@@ -306,7 +303,7 @@ class BrozzlerWorker:
         def _on_screenshot(screenshot_png):
             if on_screenshot:
                 on_screenshot(screenshot_png)
-            if self._enable_warcprox_features(site):
+            if self._proxy(site) and self._enable_warcprox_features(site):
                 self.logger.info(
                         "sending WARCPROX_WRITE_RECORD request to %s with "
                         "screenshot for %s", self._proxy(site), page)

setup.py

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

tests/test_frontier.py

@@ -67,7 +67,6 @@ def test_basics():
     assert sites[1].starts_and_stops[0]['start']
     assert sites[0] == {
         'claimed': False,
-        'enable_warcprox_features': False,
         'id': sites[0].id,
         'job_id': job.id,
         'last_claimed': brozzler.EPOCH_UTC,
@@ -86,7 +85,6 @@ def test_basics():
     }
     assert sites[1] == {
         'claimed': False,
-        'enable_warcprox_features': False,
         'id': sites[1].id,
         'job_id': job.id,
         'last_claimed': brozzler.EPOCH_UTC,