From e58b63f50412ef6a07ac565168120828933f9c29 Mon Sep 17 00:00:00 2001
From: Imdad Ahad <imdad.ahad@digital.cabinet-office.gov.uk>
Date: Fri, 28 Oct 2016 11:44:35 +0100
Subject: [PATCH] Update regex/config and remove unused imports

---
 app/utils.py                              |  2 +-
 config.py                                 | 34 +++++++++++------------
 tests/app/main/views/test_add_service.py  |  6 ++--
 tests/app/main/views/test_all_services.py |  3 +-
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/utils.py b/app/utils.py
index 3908f9c86..74767683d 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -205,5 +205,5 @@ def get_help_argument():
 
 def is_gov_user(email_address):
     valid_domains = current_app.config['EMAIL_DOMAIN_REGEXES']
-    email_regex = "[.|@]({})$".format("|".join(valid_domains))
+    email_regex = (r"[\.|@]({})$".format("|".join(valid_domains)))
     return bool(re.search(email_regex, email_address.lower()))
diff --git a/config.py b/config.py
index 2aa355a09..837a27fae 100644
--- a/config.py
+++ b/config.py
@@ -44,23 +44,23 @@ class Config(object):
     TEST_MESSAGE_FILENAME = 'Test message'
 
     EMAIL_DOMAIN_REGEXES = [
-        "gov.uk",
-        "mod.uk",
-        "mil.uk",
-        "ddc-mod.org",
-        "slc.co.uk",
-        "gov.scot",
-        "parliament.uk",
-        "nhs.uk",
-        "nhs.net",
-        "police.uk",
-        "kainos.com",
-        "salesforce.com",
-        "bitzesty.com",
-        "dclgdatamart.co.uk",
-        "valtech.co.uk",
-        "cgi.com",
-        "capita.co.uk",
+        "gov\.uk",
+        "mod\.uk",
+        "mil\.uk",
+        "ddc-mod\.org",
+        "slc\.co\.uk",
+        "gov\.scot",
+        "parliament\.uk",
+        "nhs\.uk",
+        "nhs\.net",
+        "police\.uk",
+        "kainos\.com",
+        "salesforce\.com",
+        "bitzesty\.com",
+        "dclgdatamart\.co\.uk",
+        "valtech\.co\.uk",
+        "cgi\.com",
+        "capita\.co\.uk",
         "ucds.email"
     ]
 
diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py
index 4dd440dcc..f3d492cf9 100644
--- a/tests/app/main/views/test_add_service.py
+++ b/tests/app/main/views/test_add_service.py
@@ -104,8 +104,7 @@ def test_should_return_form_errors_with_duplicate_service_name_regardless_of_cas
             assert not mock_create_service.called
 
 
-def test_non_whitelist_user_cannot_access_create_service_page(app_,
-                                                              client,
+def test_non_whitelist_user_cannot_access_create_service_page(client,
                                                               mock_login,
                                                               mock_get_non_govuser,
                                                               api_nongov_user_active):
@@ -115,8 +114,7 @@ def test_non_whitelist_user_cannot_access_create_service_page(app_,
     assert response.status_code == 403
 
 
-def test_non_whitelist_user_cannot_create_service(app_,
-                                                  client,
+def test_non_whitelist_user_cannot_create_service(client,
                                                   mock_login,
                                                   mock_get_non_govuser,
                                                   api_nongov_user_active):
diff --git a/tests/app/main/views/test_all_services.py b/tests/app/main/views/test_all_services.py
index 09cc543f7..d0931558b 100644
--- a/tests/app/main/views/test_all_services.py
+++ b/tests/app/main/views/test_all_services.py
@@ -30,8 +30,7 @@ def test_all_service_returns_403_when_not_a_platform_admin(app_,
             assert response.status_code == 403
 
 
-def test_non_gov_user_cannot_see_add_service_button(app_,
-                                                    client,
+def test_non_gov_user_cannot_see_add_service_button(client,
                                                     mock_login,
                                                     mock_get_non_govuser,
                                                     api_nongov_user_active):