summaryrefslogtreecommitdiff
path: root/django/db/models/fields/files.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 14:22:00 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-07-22 09:29:54 +0200
commit3cb2457f46b3e40ff6b6acffcb3fd44cbea091e5 (patch)
tree68e43a061f1a7a122c02d5c5b39586b32959a9dc /django/db/models/fields/files.py
parentcacd845996d1245f6aed257bff5f748f46206d3f (diff)
downloaddjango-3cb2457f46b3e40ff6b6acffcb3fd44cbea091e5.tar.gz
[py3] Replaced basestring by six.string_types.
Diffstat (limited to 'django/db/models/fields/files.py')
-rw-r--r--django/db/models/fields/files.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index b0dce381a6..d3f1327315 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -9,6 +9,7 @@ from django.core.files.storage import default_storage
from django.core.files.images import ImageFile
from django.db.models import signals
from django.utils.encoding import force_unicode, smart_str
+from django.utils import six
from django.utils.translation import ugettext_lazy as _
class FieldFile(File):
@@ -176,7 +177,7 @@ class FileDescriptor(object):
# subclasses might also want to subclass the attribute class]. This
# object understands how to convert a path to a file, and also how to
# handle None.
- if isinstance(file, basestring) or file is None:
+ if isinstance(file, six.string_types) or file is None:
attr = self.field.attr_class(instance, self.field, file)
instance.__dict__[self.field.name] = attr