Reliable sort order for facets in Python 3.5, fixing test - refs #255

datasette/templates/table.html

@@ -81,8 +81,8 @@
             </div>
             <label class="sort_by_desc"><input type="checkbox" name="_sort_by_desc"{% if sort_desc %} checked{% endif %}> descending</label>
         {% endif %}
-        {% for facet in facet_results %}
-            <input type="hidden" name="_facet" value="{{ facet }}">
+        {% for facet in sorted_facet_results %}
+            <input type="hidden" name="_facet" value="{{ facet.name }}">
         {% endfor %}
         <input type="submit" value="Apply">
     </div>

datasette/views/table.py

@@ -716,7 +716,7 @@ class TableView(RowTableShared):
                 "display_rows": display_rows,
                 "sorted_facet_results": sorted(
                     facet_results.values(),
-                    key=lambda f: len(f["results"]),
+                    key=lambda f: (len(f["results"]), f["name"]),
                     reverse=True
                 ),
                 "is_sortable": any(c["sortable"] for c in display_columns),

tests/test_html.py

@@ -210,8 +210,8 @@ def test_facets_persist_through_filter_form(app_client):
     inputs = Soup(response.body, 'html.parser').find('form').findAll('input')
     hiddens = [i for i in inputs if i['type'] == 'hidden']
     assert [
-        ('_facet', 'planet_int'),
         ('_facet', 'city_id'),
+        ('_facet', 'planet_int'),
     ] == [
         (hidden['name'], hidden['value']) for hidden in hiddens
     ]