p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #16590 -- Accepted a 'name' argument in the constructor of ContentFile, for consistency with File. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin 2011-12-30 14:51:05 +00:00
parent 27444618f6
commit c458700382
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/files/base.py
View File

@ -122,9 +122,9 @@ class ContentFile(File):
""" """
A File-like object that takes just raw content, rather than an actual file. A File-like object that takes just raw content, rather than an actual file.
""" """
def __init__(self, content): def __init__(self, content, name=None):
content = content or '' content = content or ''
super(ContentFile, self).__init__(StringIO(content)) super(ContentFile, self).__init__(StringIO(content), name=name)
self.size = len(content) self.size = len(content)
def __str__(self): def __str__(self):

11
tests/regressiontests/file_storage/tests.py
View File

@ -542,3 +542,14 @@ class InconsistentGetImageDimensionsBug(unittest.TestCase):
size_1, size_2 = get_image_dimensions(image), get_image_dimensions(image) size_1, size_2 = get_image_dimensions(image), get_image_dimensions(image)
self.assertEqual(image_pil.size, size_1) self.assertEqual(image_pil.size, size_1)
self.assertEqual(size_1, size_2) self.assertEqual(size_1, size_2)
class ContentFileTestCase(unittest.TestCase):
"""
Test that the constructor of ContentFile accepts 'name' (#16590).
"""
def test_content_file_default_name(self):
self.assertEqual(ContentFile("content").name, None)
def test_content_file_custome_name(self):
name = "I can have a name too!"
self.assertEqual(ContentFile("content", name=name).name, name)