diff options
| author | Claude Paroz <claude@2xlibre.net> | 2012-05-05 19:47:03 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-05-05 21:41:44 +0200 |
| commit | d7dfab59ead97b35c6f6786784225f377783e376 (patch) | |
| tree | d357f2b94ef010d60e9ad6602bda5537f1a28b8d /django/core/files/base.py | |
| parent | 1583d402240d88ad2a4acc024d348a21657ccaba (diff) | |
| download | django-d7dfab59ead97b35c6f6786784225f377783e376.tar.gz | |
Replaced cStringIO.StringIO by io.BytesIO.
Also replaced StringIO.StringIO by BytesIO in some other appropriate
places. StringIO is not available in Python 3.
Diffstat (limited to 'django/core/files/base.py')
| -rw-r--r-- | django/core/files/base.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/django/core/files/base.py b/django/core/files/base.py index 29dbb6fcc1..d9b0fabb33 100644 --- a/django/core/files/base.py +++ b/django/core/files/base.py @@ -1,8 +1,5 @@ import os -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO +from io import BytesIO, StringIO from django.utils.encoding import smart_str, smart_unicode from django.core.files.utils import FileProxyMixin @@ -89,7 +86,7 @@ class File(FileProxyMixin): # Iterate over this file-like object by newlines buffer_ = None for chunk in self.chunks(): - chunk_buffer = StringIO(chunk) + chunk_buffer = BytesIO(chunk) for line in chunk_buffer: if buffer_: |