More lenient data validation in process()

ckirby · Oct 21, 2015 · 676a975 · 676a975
1 parent 5ccf31a
commit 676a975
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/modelqueryform/__init__.py b/modelqueryform/__init__.py
@@ -1 +1 @@
-__version__ = "1.1.0"
+__version__ = "1.2.0"
diff --git a/modelqueryform/forms.py b/modelqueryform/forms.py
@@ -198,13 +198,9 @@ def process(self, data_set=None):
         if data_set is None:
             data_set = self.model.objects.all()
 
-        if not data_set.exists():
-            raise ImproperlyConfigured("process requires a QuerySet to filter."
-                                       "Run as form.process(QuerySet)"
-            )
-
-        if not data_set[0]._meta.fields == self.model._meta.fields:
-            raise TypeError("Match the QuerySet to this form instances Model")
+        else:
+            if data_set.first() is not None and not data_set.first()._meta.fields == self.model._meta.fields:
+                raise TypeError("Match the QuerySet to this form instances Model")
 
         filters = self.get_filters()
 

diff --git a/tests/test_forms.py b/tests/test_forms.py
@@ -103,10 +103,7 @@ def test_process_without_data_without_filters(self):
     def test_process_empty_dataset(self):
         form = FormTest({})
         form.is_valid()
-        self.assertRaises(ImproperlyConfigured,
-                          form.process,
-                          BaseModelForTest.objects.filter(integer=3)
-        )
+        self.assertEqual(len(form.process(BaseModelForTest.objects.filter(integer=3))), 0, 'Should be empty')
 
     def test_process_model_mismatch(self):
         form = FormTest({})