mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 18:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refs #28428 -- Made FileSystemStorage.save() to support pathlib.Path.

Browse source
This commit is contained in:
Hasan Ramezani 2019-10-21 18:03:48 +02:00 • committed by Mariusz Felisiak
parent 0f2975534d
commit 17752003a8
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/file_storage/tests.py
View file

@ -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