mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-25 13:13:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #10258: handle duplicate file names better.

Browse source 
Instead of just continually appending "_" to duplicate file names, Django's
default storage now appends `_1`, `_2`, `_3`, etc.

Thanks to ianschenck and Thilo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2010-02-23 22:39:22 +00:00
parent 43b47a87d3
commit 5366aa96fe
4 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/regressiontests/file_storage/tests.py
View file

@ -126,9 +126,9 @@ class FileSaveRaceConditionTest(TestCase):
name = self.save_file('conflict')
self.thread.join()
self.assert_(self.storage.exists('conflict'))
self.assert_(self.storage.exists('conflict_'))
self.assert_(self.storage.exists('conflict_1'))
self.storage.delete('conflict')
self.storage.delete('conflict_')
self.storage.delete('conflict_1')
class FileStoragePermissions(TestCase):
def setUp(self):
@ -167,7 +167,7 @@ class FileStoragePathParsing(TestCase):
self.failIf(os.path.exists(os.path.join(self.storage_dir, 'dotted_.path')))
self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test')))
self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test_')))
self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test_1')))
def test_first_character_dot(self):
"""
@ -183,7 +183,7 @@ class FileStoragePathParsing(TestCase):
if sys.version_info < (2, 6):
self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/_.test')))
else:
self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test_')))
self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test_1')))
if Image is not None:
class DimensionClosingBug(TestCase):