mirror of https://github.com/django/django.git
Refs #15362 -- Removed obsolete workaround in file_uploads test view.
This commit is contained in:
parent
56b50cbf73
commit
a98bcfb0dd
|
@ -54,32 +54,15 @@ def file_upload_view_verify(request):
|
||||||
|
|
||||||
|
|
||||||
def file_upload_unicode_name(request):
|
def file_upload_unicode_name(request):
|
||||||
|
|
||||||
# Check to see if unicode name came through properly.
|
# Check to see if unicode name came through properly.
|
||||||
if not request.FILES['file_unicode'].name.endswith(UNICODE_FILENAME):
|
if not request.FILES['file_unicode'].name.endswith(UNICODE_FILENAME):
|
||||||
return HttpResponseServerError()
|
return HttpResponseServerError()
|
||||||
|
|
||||||
response = None
|
|
||||||
|
|
||||||
# Check to make sure the exotic characters are preserved even
|
# Check to make sure the exotic characters are preserved even
|
||||||
# through file save.
|
# through file save.
|
||||||
uni_named_file = request.FILES['file_unicode']
|
uni_named_file = request.FILES['file_unicode']
|
||||||
obj = FileModel.objects.create(testfile=uni_named_file)
|
FileModel.objects.create(testfile=uni_named_file)
|
||||||
full_name = '%s/%s' % (UPLOAD_TO, uni_named_file.name)
|
full_name = '%s/%s' % (UPLOAD_TO, uni_named_file.name)
|
||||||
if not os.path.exists(full_name):
|
return HttpResponse() if os.path.exists(full_name) else HttpResponseServerError()
|
||||||
response = HttpResponseServerError()
|
|
||||||
|
|
||||||
# Cleanup the object with its exotic file name immediately.
|
|
||||||
# (shutil.rmtree used elsewhere in the tests to clean up the
|
|
||||||
# upload directory has been seen to choke on unicode
|
|
||||||
# filenames on Windows.)
|
|
||||||
obj.delete()
|
|
||||||
os.unlink(full_name)
|
|
||||||
|
|
||||||
if response:
|
|
||||||
return response
|
|
||||||
else:
|
|
||||||
return HttpResponse()
|
|
||||||
|
|
||||||
|
|
||||||
def file_upload_echo(request):
|
def file_upload_echo(request):
|
||||||
|
|
Loading…
Reference in New Issue