Merge remote-tracking branch 'origin/master' into docker

legumeinfo · Jul 9, 2020 · 0df3efc · 0df3efc
2 parents d576c28 + f3a610a
commit 0df3efc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/grin_app/tests/view_tests.py b/grin_app/tests/view_tests.py
@@ -18,12 +18,12 @@ def test_index():
     assert_ok(res)
     assert len(res.content) > 0
     html = res.content
-    assert '<html' in html
-    assert settings.BRANDING['site_abbrev'] in html
-    assert settings.BRANDING['site_heading'] in html
-    assert settings.BRANDING['home_url'] in html
-    assert settings.BRANDING['logo_url'] in html
-    assert settings.BRANDING['site_subheading'] in html
+    assert b'<html' in html
+    assert settings.BRANDING['site_abbrev'].encode() in html
+    assert settings.BRANDING['site_heading'].encode() in html
+    assert settings.BRANDING['home_url'].encode() in html
+    assert settings.BRANDING['logo_url'].encode() in html
+    assert settings.BRANDING['site_subheading'].encode() in html
 
 
 def test_search():

diff --git a/grin_app/views.py b/grin_app/views.py
@@ -216,7 +216,7 @@ def evaluation_metadata(req):
     }
     where_clauses = [
         val['sql'] for
-        key, val in GRIN_ACC_WHERE_FRAGS.items() + GRIN_EVAL_WHERE_FRAGS.items()
+        key, val in {**GRIN_ACC_WHERE_FRAGS, **GRIN_EVAL_WHERE_FRAGS}.items()
         if val['include'](sql_params)
         ]
     if len(where_clauses) == 0: