Fix sort_by_order crash when order is None

Fix sort_by_order crashing if order is None
Add a test for this

No refs

Author: JoaRiski

django_sorting_field/utils.py

@@ -6,17 +6,17 @@
 def clean_order_json(value):
         value = "[]" if value is None else value
 
+        if not isinstance(value, six.string_types):
+            return value
+
         try:
             return json.loads(value)
         except ValueError:
             return []
 
 
 def iterate_in_order(items, order):
-    # In case our order is still in json format
-    if isinstance(order, six.string_types):
-        order = clean_order_json(order)
-
+    order = clean_order_json(order)
     items_by_id = {item.id: item for item in items}
 
     # Return items that are ordered first
@@ -26,7 +26,7 @@ def iterate_in_order(items, order):
         yield items_by_id.pop(entry)
 
     # Return the rest
-    for identifier, item in items_by_id.iteritems():
+    for identifier, item in items_by_id.items():
         yield item
 
 

django_sorting_field_tests/test_utils.py

@@ -0,0 +1,19 @@
+from django_sorting_field.utils import sort_by_order
+
+
+class DummyItem(object):
+
+    def __init__(self, item_id):
+        self.id = item_id
+
+
+def test_sort_by_order_none():
+    items = [
+        DummyItem(0),
+        DummyItem(1),
+        DummyItem(2),
+    ]
+    sorted_items = sort_by_order(items, None)
+    assert sorted_items[0].id == 0
+    assert sorted_items[1].id == 1
+    assert sorted_items[2].id == 2

setup.cfg

@@ -12,6 +12,7 @@ include_package_data = True
 packages = find:
 install_requires =
     django
+    six
 
 [bdist_wheel]
 universal = 1