Changeset 3851

Timestamp:

09/26/06 01:33:32 (2 years ago)

Author:

mtredinnick

Message:

Fixed #2265 -- Fixed problem with using iterators for "choices" attribute.
Thanks, Alex Dedul.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (3 diffs)
• django/trunk/django/utils/itercompat.py (added)

django/trunk/django/db/models/fields/__init__.py

@@ -6 +6 @@
-from django.core.exceptions import ObjectDoesNotExist
-from django.utils.functional import curry
+from django.utils.itercompat import tee
-from django.utils.text import capfirst
-from django.utils.translation import gettext, gettext_lazy
@@ -81 +82 @@
-        self.unique_for_date, self.unique_for_month = unique_for_date, unique_for_month
-        self.unique_for_year = unique_for_year
-
+_
-        self.radio_admin = radio_admin
-        self.help_text = help_text
@@ -324 +325 @@
-    def bind(self, fieldmapping, original, bound_field_class):
-        return bound_field_class(self, fieldmapping, original)
+
+    def _get_choices(self):
+        if hasattr(self._choices, 'next'):
+            choices, self._choices = tee(self._choices)
+            return choices
+        else:
+            return self._choices
+    choices = property(_get_choices)
-
-class AutoField(Field):