Ticket #5445: iterables3.patch

django/http/__init__.py

@@ -304 +289 @@
-    content = property(_get_content, _set_content)
-
-    def __iter__(self):
-self._container.__iter__(
+iter(self._container
-        return self
-
-    def next(self):

django/test/client.py

@@ -16 +16 @@
-from django.utils.functional import curry
-from django.utils.encoding import smart_str
-from django.utils.http import urlencode
+from django.utils.itercompat import is_iterable
-
-BOUNDARY = 'BoUnDaRyStRiNg'
-MULTIPART_CONTENT = 'multipart/form-data; boundary=%s' % BOUNDARY
@@ -74 +75 @@
-                '',
-                value.read()
-            ])
-
-
+
+
+
+
+
+
+
+
+
+
-                lines.extend([
-                    '--' + boundary,
-                    'Content-Disposition: form-data; name="%s"' % to_str(key),
-                    '',
-item
+value
-                ])
-        else:
-            lines.extend([
-                '--' + boundary,
-                'Content-Disposition: form-data; name="%s"' % to_str(key),
-                '',
-                to_str(value)
-            ])

django/core/management/validation.py

@@ -1 +1 @@
-import sys
-from django.core.management.color import color_style
+from django.utils.itercompat import is_iterable
-
-class ModelErrorCollection:
-    def __init__(self, outfile=sys.stdout):
@@ -51 +52 @@
-            if f.prepopulate_from is not None and type(f.prepopulate_from) not in (list, tuple):
-                e.add(opts, '"%s": prepopulate_from should be a list or tuple.' % f.name)
-            if f.choices:
-
+
+
-                    e.add(opts, '"%s": "choices" should be iterable (e.g., a tuple or list).' % f.name)
-                else:
-                    for c in f.choices:

django/utils/itercompat.py

@@ -57 +57 @@
-    tee = compat_tee
-if hasattr(itertools, 'groupby'):
-    groupby = itertools.groupby
+
+def is_iterable(x):
+    "A implementation independent way of checking for iterables"
+    try:
+        iter(x)
+    except TypeError:
+        return False
+    else:
+        return True
+

../django/template/__init__.py

@@ -58 +58 @@
-from inspect import getargspec
-from django.conf import settings
-from django.template.context import Context, RequestContext, ContextPopException
+from django.utils.itercompat import is_iterable
-from django.utils.functional import curry, Promise
-from django.utils.text import smart_split
-from django.utils.encoding import smart_unicode, force_unicode
-from django.utils.translation import ugettext as _