Support for Q() lookups returning multiple objects

django_any/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = (0, 2, 3, 'final', 0)
+__version__ = (0, 2, 4, 'final', 0)
 try:
     from django_any.forms import any_form_field, any_form
     from django_any.models import any_field, any_model

django_any/models.py

@@ -8,10 +8,10 @@
 from decimal import Decimal
 from datetime import date, datetime, time
 from string import ascii_letters, digits, hexdigits
-from random import choice
+from random import choice, randint
 
 from django.conf import settings
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ValidationError, MultipleObjectsReturned
 from django.core import validators
 from django.db import models, IntegrityError
 from django.db.models import Q
@@ -165,15 +165,15 @@ def any_datetime_field(field, **kwargs):
     """
     USE_TZ = getattr(settings, 'USE_TZ', False)
     from_date = kwargs.get('from_date', datetime(1990, 1, 1))
-    
+
     if USE_TZ:
         from django.utils.timezone import now, get_current_timezone, make_aware
-        
+
         from_date = make_aware(from_date, get_current_timezone())
         to_date = kwargs.get('to_date', now())
-    else:    
+    else:
         to_date = kwargs.get('to_date', datetime.today())
-        
+
     return xunit.any_datetime(from_date=from_date, to_date=to_date)
 
 
@@ -497,7 +497,14 @@ def _fill_model_fields(model, **kwargs):
                 Lookup ForeingKey field in db
                 """
                 key_field = model._meta.get_field(field.name)
-                value = key_field.rel.to.objects.get(kwargs[field.name])
+                # Handle situation if lookup returns multiple objects
+                try:
+                    value = key_field.rel.to.objects.get(kwargs[field.name])
+                except MultipleObjectsReturned:
+                    queryset = key_field.rel.to.objects.filter(
+                                                        kwargs[field.name])
+                    queryset_count = queryset.count()
+                    value = queryset[randint(0, queryset_count - 1)]
                 setattr(model, field.name, value)
             else:
                 # TODO support any_model call

django_any/test.py

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
-import time, random
-
-try:
-    from unittest import _strclass
-except ImportError:
-    _strclass = str
+import time
+import random
 
 from django import forms
 from django_any import any_form
@@ -127,7 +123,11 @@ def __new__(cls, cls_name, bases, attrs):
         attrs['__django_any_seed'] = 0
 
         def shortDescription(self):
-            return "%s (%s) With seed %s" % (self._testMethodName,  _strclass(self.__class__), getattr(self, '__django_any_seed'))
+            return "%s (%s.%s) With seed %s" % \
+                (self._testMethodName,
+                 self.__module__,
+                 self.__name__,
+                 getattr(self, '__django_any_seed'))
 
         for name, func in attrs.items():
             if name.startswith('test') and hasattr(func, '__call__'):
@@ -142,4 +142,3 @@ def shortDescription(self):
         testcase = super(WithTestDataSeed, cls).__new__(cls, cls_name, bases, attrs)
         testcase.shortDescription = shortDescription
         return testcase
-

django_any/tests/model_qobjects_spec.py

@@ -11,20 +11,31 @@
 class QObjectRelated(models.Model):
     class Meta:
         app_label = 'django_any'
+    flag = models.BooleanField(default=False)
 
 
 class RelatedToQObject(models.Model):
     related = models.ForeignKey(QObjectRelated)
 
     class Meta:
         app_label = 'django_any'
-    
+
 
 class QObjectsSupport(TestCase):
     def setUp(self):
-        self.related = any_model(QObjectRelated)
-        
+        self.related = any_model(QObjectRelated, flag=False)
+
     def test_qobject_specification(self):
         result = any_model(RelatedToQObject, related=Q(pk=self.related.pk))
         self.assertEqual(self.related, result.related)
 
+    def test_qobject_multiple_objects_returned(self):
+        """If Q() lookup return multiple objects, we select
+        random one.
+
+        """
+        # Create additional related instance
+        any_model(QObjectRelated, flag=False)
+
+        result = any_model(RelatedToQObject, related=Q(flag=False))
+        self.assertIn(result.related, list(QObjectRelated.objects.all()))