[1.5.x] Fixed #18963 -- Used a subclass-friendly pattern

for Python 2 object model compatibility methods.

Backport of fc10418 from master.

2 files changed, 5 insertions, 15 deletions

diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
index 5bcc874982..9413a1eabb 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -256,7 +256,7 @@ class MultiPartParser(object):
         """Cleanup filename from Internet Explorer full paths."""
         return filename and filename[filename.rfind("\\")+1:].strip()
 
-class LazyStream(object):
+class LazyStream(six.Iterator):
     """
     The LazyStream wrapper allows one to get and "unget" bytes from a stream.
 
@@ -323,8 +323,6 @@ class LazyStream(object):
         self.position += len(output)
         return output
 
-    next = __next__             # Python 2 compatibility
-
     def close(self):
         """
         Used to invalidate/disable this lazy stream.
@@ -369,7 +367,7 @@ class LazyStream(object):
                 " if there is none, report this to the Django developers."
             )
 
-class ChunkIter(object):
+class ChunkIter(six.Iterator):
     """
     An iterable that will yield chunks of data. Given a file-like object as the
     constructor, this object will yield chunks of read operations from that
@@ -389,12 +387,10 @@ class ChunkIter(object):
         else:
             raise StopIteration()
 
-    next = __next__             # Python 2 compatibility
-
     def __iter__(self):
         return self
 
-class InterBoundaryIter(object):
+class InterBoundaryIter(six.Iterator):
     """
     A Producer that will iterate over boundaries.
     """
@@ -411,9 +407,7 @@ class InterBoundaryIter(object):
         except InputStreamExhausted:
             raise StopIteration()
 
-    next = __next__             # Python 2 compatibility
-
-class BoundaryIter(object):
+class BoundaryIter(six.Iterator):
     """
     A Producer that is sensitive to boundaries.
 
@@ -489,8 +483,6 @@ class BoundaryIter(object):
                 stream.unget(chunk[-rollback:])
                 return chunk[:-rollback]
 
-    next = __next__             # Python 2 compatibility
-
     def _find_boundary(self, data, eof = False):
         """
         Finds a multipart boundary in data.
diff --git a/django/http/response.py b/django/http/response.py
index 56e3d00096..df0a955b18 100644
--- a/django/http/response.py
+++ b/django/http/response.py
@@ -23,7 +23,7 @@ class BadHeaderError(ValueError):
     pass
 
 
-class HttpResponseBase(object):
+class HttpResponseBase(six.Iterator):
     """
     An HTTP response base class with dictionary-accessed headers.
 
@@ -218,8 +218,6 @@ class HttpResponseBase(object):
         # Subclasses must define self._iterator for this function.
         return self.make_bytes(next(self._iterator))
 
-    next = __next__             # Python 2 compatibility
-
     # These methods partially implement the file-like object interface.
     # See http://docs.python.org/lib/bltin-file-objects.html