Refactored register_errorhandlers so that it handles HTTPError

Remove most cases where we catch HTTPError

app/main/views/jobs.py

@@ -20,89 +20,71 @@ from app.main.dao import services_dao
 @main.route("/services/<service_id>/jobs")
 @login_required
 def view_jobs(service_id):
-    try:
-        jobs = job_api_client.get_job(service_id)['data']
-        return render_template(
-            'views/jobs/jobs.html',
-            jobs=jobs,
-            service_id=service_id
-        )
-    except HTTPError as e:
-        if e.status_code == 404:
-            abort(404)
-        else:
-            raise e
+    jobs = job_api_client.get_job(service_id)['data']
+    return render_template(
+        'views/jobs/jobs.html',
+        jobs=jobs,
+        service_id=service_id
+    )
 
 
 @main.route("/services/<service_id>/jobs/<job_id>")
 @login_required
 def view_job(service_id, job_id):
     service = services_dao.get_service_by_id_or_404(service_id)
-    try:
-        job = job_api_client.get_job(service_id, job_id)['data']
-        template = templates_dao.get_service_template_or_404(service_id, job['template'])['data']
-        notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
-        finished = job['status'] == 'finished'
-        return render_template(
-            'views/jobs/job.html',
-            notifications=notifications['notifications'],
-            counts={
-                'queued': 0 if finished else job['notification_count'],
-                'sent': job['notification_count'] if finished else 0,
-                'failed': 0,
-                'cost': u'£0.00'
-            },
-            uploaded_at=job['created_at'],
-            finished_at=job['updated_at'] if finished else None,
-            uploaded_file_name=job['original_file_name'],
-            template=Template(
-                template,
-                prefix=service['name'] if template['template_type'] == 'sms' else ''
-            ),
-            service_id=service_id,
-            service=service,
-            job_id=job_id
-        )
-    except HTTPError as e:
-        if e.status_code == 404:
-            abort(404)
-        else:
-            raise e
+    job = job_api_client.get_job(service_id, job_id)['data']
+    template = templates_dao.get_service_template_or_404(service_id, job['template'])['data']
+    notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
+    finished = job['status'] == 'finished'
+    return render_template(
+        'views/jobs/job.html',
+        notifications=notifications['notifications'],
+        counts={
+            'queued': 0 if finished else job['notification_count'],
+            'sent': job['notification_count'] if finished else 0,
+            'failed': 0,
+            'cost': u'£0.00'
+        },
+        uploaded_at=job['created_at'],
+        finished_at=job['updated_at'] if finished else None,
+        uploaded_file_name=job['original_file_name'],
+        template=Template(
+            template,
+            prefix=service['name'] if template['template_type'] == 'sms' else ''
+        ),
+        service_id=service_id,
+        service=service,
+        job_id=job_id
+    )
 
 
 @main.route("/services/<service_id>/jobs/<job_id>.json")
 @login_required
 def view_job_updates(service_id, job_id):
     service = services_dao.get_service_by_id_or_404(service_id)
-    try:
-        job = job_api_client.get_job(service_id, job_id)['data']
-        notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
-        finished = job['status'] == 'finished'
-        return jsonify(**{
-            'counts': render_template(
-                'partials/jobs/count.html',
-                counts={
-                    'queued': 0 if finished else job['notification_count'],
-                    'sent': job['notification_count'] if finished else 0,
-                    'failed': 0,
-                    'cost': u'£0.00'
-                }
-            ),
-            'notifications': render_template(
-                'partials/jobs/notifications.html',
-                notifications=notifications['notifications']
-            ),
-            'status': render_template(
-                'partials/jobs/status.html',
-                uploaded_at=job['created_at'],
-                finished_at=job['updated_at'] if finished else None
-            ),
-        })
-    except HTTPError as e:
-        if e.status_code == 404:
-            abort(404)
-        else:
-            raise e
+    job = job_api_client.get_job(service_id, job_id)['data']
+    notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
+    finished = job['status'] == 'finished'
+    return jsonify(**{
+        'counts': render_template(
+            'partials/jobs/count.html',
+            counts={
+                'queued': 0 if finished else job['notification_count'],
+                'sent': job['notification_count'] if finished else 0,
+                'failed': 0,
+                'cost': u'£0.00'
+            }
+        ),
+        'notifications': render_template(
+            'partials/jobs/notifications.html',
+            notifications=notifications['notifications']
+        ),
+        'status': render_template(
+            'partials/jobs/status.html',
+            uploaded_at=job['created_at'],
+            finished_at=job['updated_at'] if finished else None
+        ),
+    })
 
 
 @main.route("/services/<service_id>/jobs/<job_id>/notification/<string:notification_id>")