Merge "Fix issue with uploading image to glance on Python3"

This commit is contained in:
Zuul 2018-06-04 07:30:24 +00:00 committed by Gerrit Code Review
commit edbb0143c8

@ -525,7 +525,10 @@ def image_create(request, **kwargs):
return ExternallyUploadedImage(image, request)
elif isinstance(data, TemporaryUploadedFile):
# Hack to fool Django, so we can keep file open in the new thread.
data.file.close_called = True
if six.PY2:
data.file.close_called = True
else:
data.file._closer.close_called = True
elif isinstance(data, InMemoryUploadedFile):
# Clone a new file for InMemeoryUploadedFile.
# Because the old one will be closed by Django.