summaryrefslogtreecommitdiff
path: root/tests/file_storage
diff options
context:
space:
mode:
authorHasan Ramezani <hasan.r67@gmail.com>2019-10-21 18:03:48 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-10-31 09:06:05 +0100
commit17752003a8c115ff79f5f21655f5e9b8b2af67f4 (patch)
tree58c3b3505daa755f95e0a3dd6987d81177591377 /tests/file_storage
parent0f2975534dc6a010a4da28165b235f36bf1df24f (diff)
downloaddjango-17752003a8c115ff79f5f21655f5e9b8b2af67f4.tar.gz
Refs #28428 -- Made FileSystemStorage.save() to support pathlib.Path.
Diffstat (limited to 'tests/file_storage')
-rw-r--r--tests/file_storage/tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py
index 779116b3bd..be6e11de93 100644
--- a/tests/file_storage/tests.py
+++ b/tests/file_storage/tests.py
@@ -545,7 +545,7 @@ class FileStorageTests(SimpleTestCase):
p = Path('test.file')
self.assertFalse(self.storage.exists(p))
f = ContentFile('custom contents')
- f_name = self.storage.save(str(p), f)
+ f_name = self.storage.save(p, f)
# Storage basic methods.
self.assertEqual(self.storage.path(p), os.path.join(self.temp_dir, p))
self.assertEqual(self.storage.size(p), 15)
@@ -560,10 +560,10 @@ class CustomStorage(FileSystemStorage):
"""
Append numbers to duplicate files rather than underscores, like Trac.
"""
- basename, *ext = name.split('.')
+ basename, *ext = os.path.splitext(name)
number = 2
while self.exists(name):
- name = '.'.join([basename, str(number)] + ext)
+ name = ''.join([basename, '.', str(number)] + ext)
number += 1
return name