darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 16:01:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundant try block

Browse Source
This commit is contained in:
Ken Tsang
2017-03-22 14:01:04 +00:00
parent 8e5266e89b
commit 22239deb90
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/v2/template/get_template.py
View File

@@ -14,15 +14,12 @@ from app.v2.template.template_schemas import get_template_by_id_request
@v2_template_blueprint.route("/<template_id>", methods=['GET']) @v2_template_blueprint.route("/<template_id>", methods=['GET'])
@v2_template_blueprint.route("/<template_id>/version/<int:version>", methods=['GET']) @v2_template_blueprint.route("/<template_id>/version/<int:version>", methods=['GET'])
def get_template_by_id(template_id, version=None): def get_template_by_id(template_id, version=None):
try: _data = {}
_data = {} _data['id'] = template_id
_data['id'] = template_id if version:
if version: _data['version'] = version
_data['version'] = version
data = validate(_data, get_template_by_id_request) data = validate(_data, get_template_by_id_request)
except ValueError or AttributeError:
abort(404)
template = templates_dao.dao_get_template_by_id_and_service_id( template = templates_dao.dao_get_template_by_id_and_service_id(
template_id, api_user.service_id, data.get('version')) template_id, api_user.service_id, data.get('version'))

9
app/v2/template/post_template.py
View File

@@ -15,13 +15,10 @@ from app.v2.template.template_schemas import post_template_preview_request, crea
@v2_template_blueprint.route("/<template_id>/preview", methods=['POST']) @v2_template_blueprint.route("/<template_id>/preview", methods=['POST'])
def post_template_preview(template_id): def post_template_preview(template_id):
try: _data = request.get_json()
_data = request.get_json() _data['id'] = template_id
_data['id'] = template_id
data = validate(_data, post_template_preview_request) data = validate(_data, post_template_preview_request)
except ValueError or AttributeError:
abort(404)
template = templates_dao.dao_get_template_by_id_and_service_id( template = templates_dao.dao_get_template_by_id_and_service_id(
template_id, api_user.service_id) template_id, api_user.service_id)