From 216bb2e8fbc3cb37615bbd70edaa73287acdca81 Mon Sep 17 00:00:00 2001
From: James Beith <james@beith.co.uk>
Date: Wed, 22 Mar 2017 16:38:16 +1100
Subject: Fixed #27975 -- Fixed crash if ModelChoiceField's queryset=None.

Regression in 9153d8fbd6385db9f48793662de789fc3d686841.
---
 django/forms/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'django/forms')

diff --git a/django/forms/models.py b/django/forms/models.py
index c8626f57b2..b259a8df28 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -1155,7 +1155,8 @@ class ModelChoiceField(ChoiceField):
     def __deepcopy__(self, memo):
         result = super(ChoiceField, self).__deepcopy__(memo)
         # Need to force a new ModelChoiceIterator to be created, bug #11183
-        result.queryset = self.queryset.all()
+        if self.queryset is not None:
+            result.queryset = self.queryset.all()
         return result
 
     def _get_queryset(self):
-- 
cgit v1.3