summaryrefslogtreecommitdiff
path: root/django/db/models/fields/files.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-11 23:17:25 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-20 08:44:31 +0100
commitdc8834cad41aa407f402dc54788df3cd37ab3e22 (patch)
treef44864ba7a64c614f00a3d2ad8548ce479e59e1e /django/db/models/fields/files.py
parentbf1c9570270b46e9e92b256fb9be394258029bbf (diff)
downloaddjango-dc8834cad41aa407f402dc54788df3cd37ab3e22.tar.gz
Refs #23919 -- Removed unneeded force_str calls
Diffstat (limited to 'django/db/models/fields/files.py')
-rw-r--r--django/db/models/fields/files.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 1235f65730..d1937bd5db 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -9,7 +9,7 @@ from django.core.files.storage import default_storage
from django.core.validators import validate_image_file_extension
from django.db.models import signals
from django.db.models.fields import Field
-from django.utils.encoding import force_str, force_text
+from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
@@ -304,7 +304,7 @@ class FileField(Field):
if callable(self.upload_to):
filename = self.upload_to(instance, filename)
else:
- dirname = force_text(datetime.datetime.now().strftime(force_str(self.upload_to)))
+ dirname = force_text(datetime.datetime.now().strftime(self.upload_to))
filename = posixpath.join(dirname, filename)
return self.storage.generate_filename(filename)