diff options
| author | Claude Paroz <claude@2xlibre.net> | 2012-05-22 20:26:46 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-05-22 20:37:38 +0200 |
| commit | df7a65ac4ba36dd155e80b8bcfe607390976ad47 (patch) | |
| tree | 19c627b4782dc59b8ec384f1298670701e7cbb1e /django/db/models/fields | |
| parent | d5c7f9efc3702888b556cbf932116421b464e8b8 (diff) | |
Replaced 'next' testing by collections.Iterator testing.
The new construct is also Python 3 compatible (where 'next' has
been renamed to '__next__').
Diffstat (limited to 'django/db/models/fields')
| -rw-r--r-- | django/db/models/fields/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index f694958692..50976db339 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -1,3 +1,4 @@ +import collections import copy import datetime import decimal @@ -436,7 +437,7 @@ class Field(object): return bound_field_class(self, fieldmapping, original) def _get_choices(self): - if hasattr(self._choices, 'next'): + if isinstance(self._choices, collections.Iterator): choices, self._choices = tee(self._choices) return choices else: |