summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2019-08-18 11:40:11 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-08-18 20:34:58 +0200
commitd1c2e6dd04d4ddc8ace17e6abfed16ac46459d1e (patch)
tree89284f40bbda4237df30210356608d2b2d2b9ab6 /django
parentaf69842dbd98e69519f1263eca2619c3165ba13b (diff)
Refs #28428 -- Made FileField.upload_to support pathlib.Path.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/files.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 8f12e80725..b03d54366a 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -302,7 +302,7 @@ class FileField(Field):
if callable(self.upload_to):
filename = self.upload_to(instance, filename)
else:
- dirname = datetime.datetime.now().strftime(self.upload_to)
+ dirname = datetime.datetime.now().strftime(str(self.upload_to))
filename = posixpath.join(dirname, filename)
return self.storage.generate_filename(filename)