Merge pull request #2869 from alphagov/update-dependencies

Update pyexcel, pyexcel-io and werkzeug

app/main/views/choose_account.py

@@ -1,19 +1,19 @@
 from flask import redirect, render_template, session, url_for
 from flask_login import current_user, login_required
-from werkzeug.routing import RequestRedirect
 
 from app import user_api_client
 from app.main import main
+from app.utils import PermanentRedirect
 
 
 @main.route("/services")
 def choose_service():
-    raise RequestRedirect(url_for('.choose_account'))
+    raise PermanentRedirect(url_for('.choose_account'))
 
 
 @main.route("/services-or-dashboard")
 def services_or_dashboard():
-    raise RequestRedirect(url_for('.show_accounts_or_dashboard'))
+    raise PermanentRedirect(url_for('.show_accounts_or_dashboard'))
 
 
 @main.route("/accounts")

app/main/views/send.py

@@ -24,7 +24,6 @@ from notifications_utils.recipients import (
 )
 from notifications_utils.sanitise_text import SanitiseASCII
 from orderedset import OrderedSet
-from werkzeug.routing import RequestRedirect
 from xlrd.biffh import XLRDError
 from xlrd.xldate import XLDateError
 
@@ -49,6 +48,7 @@ from app.s3_client.s3_csv_client import (
 )
 from app.template_previews import TemplatePreview, get_page_count_for_letter
 from app.utils import (
+    PermanentRedirect,
     Spreadsheet,
     email_or_sms_not_enabled,
     get_errors_for_csv,
@@ -512,7 +512,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
         # If we just return a `redirect` (302) object here, we'll get
         # errors when we try and unpack in the check_messages route.
         # Rasing a werkzeug.routing redirect means that doesn't happen.
-        raise RequestRedirect(url_for(
+        raise PermanentRedirect(url_for(
             '.send_messages',
             service_id=service_id,
             template_id=template_id
@@ -875,7 +875,7 @@ def _check_notification(service_id, template_id, exception=None):
         )
         or not all_placeholders_in_session(template.placeholders)
     ):
-        raise RequestRedirect(back_link)
+        raise PermanentRedirect(back_link)
 
     template.values = get_recipient_and_placeholders_from_session(template.template_type)
     return dict(

app/main/views/verify.py

@@ -64,7 +64,7 @@ def verify_email(token):
 
     session['user_details'] = {"email": user.email_address, "id": user.id}
     user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
-    return redirect('verify')
+    return redirect(url_for('main.verify'))
 
 
 def activate_user(user_id):