Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove catchall exception handling in profile image api

Browse Source
This commit is contained in:
jsa
2015-03-31 17:26:17 -04:00
committed by Andy Armstrong
parent bb2599cecd
commit a37166c3be
2 changed files with 25 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
openedx/core/djangoapps/profile_images/tests/test_views.py
View File

@@ -223,12 +223,8 @@ class ProfileImageUploadTestCase(ProfileImageEndpointTestCase):
"""
image_open.side_effect = [Exception(u"whoops"), None]
with make_image_file() as image_file:
response = self.client.post(self.url, {'file': image_file}, format='multipart')
self.check_response(
response, 400,
expected_developer_message=u"Upload failed for profile image: whoops",
expected_user_message=u"Upload failed for profile image",
)
with self.assertRaises(Exception):
self.client.post(self.url, {'file': image_file}, format='multipart')
self.check_images(False)
self.check_has_profile_image(False)
self.assertFalse(mock_log.info.called)
@@ -321,12 +317,8 @@ class ProfileImageRemoveTestCase(ProfileImageEndpointTestCase):
messages are returned.
"""
user_profile_save.side_effect = [Exception(u"whoops"), None]
response = self.client.post(self.url)
self.check_response(
response, 400,
expected_developer_message=u"Delete failed for profile image: whoops",
expected_user_message=u"Delete failed for profile image",
)
with self.assertRaises(Exception):
self.client.post(self.url)
self.check_images(True) # thumbnails should remain intact.
self.check_has_profile_image(True)
self.assertFalse(mock_log.info.called)

61
openedx/core/djangoapps/profile_images/views.py
View File

@@ -80,41 +80,31 @@ class ProfileImageUploadView(APIView):
status=status.HTTP_400_BAD_REQUEST
)
try:
# process the upload.
uploaded_file = request.FILES['file']
# process the upload.
uploaded_file = request.FILES['file']
# no matter what happens, delete the temporary file when we're done
with closing(uploaded_file):
# no matter what happens, delete the temporary file when we're done
with closing(uploaded_file):
# image file validation.
try:
validate_uploaded_image(uploaded_file)
except ImageValidationError as error:
return Response(
{"developer_message": error.message, "user_message": error.user_message},
status=status.HTTP_400_BAD_REQUEST,
)
# generate profile pic and thumbnails and store them
profile_image_names = get_profile_image_names(username)
create_profile_images(uploaded_file, profile_image_names)
# update the user account to reflect that a profile image is available.
set_has_profile_image(username, True, _make_upload_dt())
log.info(
LOG_MESSAGE_CREATE,
{'image_names': profile_image_names.values(), 'user_id': request.user.id}
# image file validation.
try:
validate_uploaded_image(uploaded_file)
except ImageValidationError as error:
return Response(
{"developer_message": error.message, "user_message": error.user_message},
status=status.HTTP_400_BAD_REQUEST,
)
except Exception as error:
return Response(
{
"developer_message": u"Upload failed for profile image: {error}".format(error=error),
"user_message": _(u"Upload failed for profile image"),
},
status=status.HTTP_400_BAD_REQUEST
# generate profile pic and thumbnails and store them
profile_image_names = get_profile_image_names(username)
create_profile_images(uploaded_file, profile_image_names)
# update the user account to reflect that a profile image is available.
set_has_profile_image(username, True, _make_upload_dt())
log.info(
LOG_MESSAGE_CREATE,
{'image_names': profile_image_names.values(), 'user_id': request.user.id}
)
# send client response.
@@ -165,15 +155,6 @@ class ProfileImageRemoveView(APIView):
)
except UserNotFound:
return Response(status=status.HTTP_404_NOT_FOUND)
except Exception as error:
return Response(
{
"developer_message": u"Delete failed for profile image: {error}".format(error=error),
"user_message": _(u"Delete failed for profile image"),
},
status=status.HTTP_400_BAD_REQUEST
)
# send client response.
return Response(status=status.HTTP_204_NO_CONTENT)