Make passing the model argument to queryset's __init__ optional. Fixes #241.

Author: spectras

docs/public/release_notes.rst

@@ -2,6 +2,17 @@
 Release Notes
 #############
 
+.. release 1.2.1
+
+*****************************
+1.2.1 - upcoming release
+*****************************
+
+Fixes:
+
+- Make passing the ``model`` argument to queryset's ``__init__`` optional. Still
+  allow it to be passed either as a positional or named argument — :issue:`241`.
+
 .. release 1.2.0
 
 *****************************

hvad/manager.py

@@ -177,12 +177,20 @@ class TranslationQueryset(QuerySet):
         override_classes[DateTimeQuerySet] = SkipMasterSelectMixin
     _skip_master_select = False
 
-    def __init__(self, model, *args, **kwargs):
-        if hasattr(model._meta, 'translations_model'):
-            # normal creation gets a shared model that we must flip around
-            model, self.shared_model = model._meta.translations_model, model
-        elif not hasattr(model._meta, 'shared_model'):
-            raise TypeError('TranslationQueryset only works on translatable models')
+    def __init__(self, *args, **kwargs):
+        # model can be either first positional, or a named arg
+        if len(args) >= 1:
+            model, args = args[0], args[1:]
+        else:
+            model = kwargs.pop('model', None)
+
+        if model is not None:  # check the given model is correct
+            if hasattr(model._meta, 'translations_model'):
+                # normal creation gets a shared model that we must flip around
+                model, self.shared_model = model._meta.translations_model, model
+            elif not hasattr(model._meta, 'shared_model'):
+                raise TypeError('TranslationQueryset only works on translatable models')
+
         self._local_field_names = None
         self._field_translator = None
         self._language_code = None

hvad/tests/basic.py

@@ -14,6 +14,7 @@
 from hvad.test_utils.testcase import HvadTestCase, minimumDjangoVersion
 from hvad.test_utils.project.app.models import Normal, Unique, Related, MultipleFields, Boolean, Standard
 from hvad.test_utils.project.alternate_models_app.models import NormalAlternate
+from copy import deepcopy
 
 
 class DefinitionTests(HvadTestCase):
@@ -162,6 +163,11 @@ def test_options(self):
 
 
 class QuerysetTest(HvadTestCase):
+    def test_deepcopy(self):
+        qs = Normal.objects.language().all()
+        other = deepcopy(qs)
+        self.assertEquals(other.model, qs.model)
+
     def test_bad_model(self):
         with self.assertRaises(TypeError):
             TranslationQueryset(Standard)