diff options
| author | Tim Graham <timograham@gmail.com> | 2013-07-13 13:29:11 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-07-14 13:02:55 -0400 |
| commit | 2456ffa42c33d63b54579eae0f5b9cf2a8cd3714 (patch) | |
| tree | 06a8364994fcb6689f39cdf47b0f0372302ee2c5 /django/db/models/fields | |
| parent | 0d81fd0e5f44432cbd1efb9b0e655116427dee6e (diff) | |
Fixed #20746 -- Removed Python 2.6 specific code/docs
Diffstat (limited to 'django/db/models/fields')
| -rw-r--r-- | django/db/models/fields/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index a7e0b52e87..ddc76fccf7 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -1,5 +1,6 @@ from __future__ import unicode_literals +import collections import copy import datetime import decimal @@ -17,7 +18,6 @@ from django.core import exceptions, validators from django.utils.datastructures import DictWrapper from django.utils.dateparse import parse_date, parse_datetime, parse_time from django.utils.functional import curry, total_ordering -from django.utils.itercompat import is_iterator from django.utils.text import capfirst from django.utils import timezone from django.utils.translation import ugettext_lazy as _ @@ -585,7 +585,7 @@ class Field(object): return bound_field_class(self, fieldmapping, original) def _get_choices(self): - if is_iterator(self._choices): + if isinstance(self._choices, collections.Iterator): choices, self._choices = tee(self._choices) return choices else: |
