Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6d4d4df

Browse files
Ensure closables in request.FILES get closed. (#5262)
Ensure closables on `.FILES` get closed.
1 parentb905197 commit6d4d4df

File tree

3 files changed

+36
-1
lines changed

3 files changed

+36
-1
lines changed

‎rest_framework/request.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,10 @@ def _load_data_and_files(self):
250250
else:
251251
self._full_data=self._data
252252

253+
# copy files refs to the underlying request so that closable
254+
# objects are handled appropriately.
255+
self._request._files=self._files
256+
253257
def_load_stream(self):
254258
"""
255259
Return the content body of the request, as a stream.

‎tests/test_fields.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ class TestDateTimeField(FieldValues):
11441144
valid_inputs= {
11451145
'2001-01-01 13:00':datetime.datetime(2001,1,1,13,00,tzinfo=utc),
11461146
'2001-01-01T13:00':datetime.datetime(2001,1,1,13,00,tzinfo=utc),
1147-
'2001-01-01T13:00Z':datetime.datetime(2001,1,1,13,00,tzinfo=utc)
1147+
'2001-01-01T13:00Z':datetime.datetime(2001,1,1,13,00,tzinfo=utc),
11481148
datetime.datetime(2001,1,1,13,00):datetime.datetime(2001,1,1,13,00,tzinfo=utc),
11491149
datetime.datetime(2001,1,1,13,00,tzinfo=utc):datetime.datetime(2001,1,1,13,00,tzinfo=utc),
11501150
}

‎tests/test_request.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"""
44
from __future__importunicode_literals
55

6+
importos.path
7+
importtempfile
8+
69
fromdjango.conf.urlsimporturl
710
fromdjango.contrib.authimportauthenticate,login,logout
811
fromdjango.contrib.auth.modelsimportUser
@@ -120,11 +123,39 @@ def post(self, request):
120123

121124
returnResponse(status=status.HTTP_500_INTERNAL_SERVER_ERROR)
122125

126+
127+
classFileUploadView(APIView):
128+
defpost(self,request):
129+
filenames= [file.temporary_file_path()forfileinrequest.FILES.values()]
130+
131+
forfilenameinfilenames:
132+
assertos.path.exists(filename)
133+
134+
returnResponse(status=status.HTTP_200_OK,data=filenames)
135+
136+
123137
urlpatterns= [
124138
url(r'^$',MockView.as_view()),
139+
url(r'^upload/$',FileUploadView.as_view())
125140
]
126141

127142

143+
@override_settings(
144+
ROOT_URLCONF='tests.test_request',
145+
FILE_UPLOAD_HANDLERS=['django.core.files.uploadhandler.TemporaryFileUploadHandler'])
146+
classFileUploadTests(TestCase):
147+
148+
deftest_fileuploads_closed_at_request_end(self):
149+
withtempfile.NamedTemporaryFile()asf:
150+
response=self.client.post('/upload/', {'file':f})
151+
152+
# sanity check that file was processed
153+
assertlen(response.data)==1
154+
155+
forfileinresponse.data:
156+
assertnotos.path.exists(file)
157+
158+
128159
@override_settings(ROOT_URLCONF='tests.test_request')
129160
classTestContentParsingWithAuthentication(TestCase):
130161
defsetUp(self):

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp