Update to utils 2.0.0

…and remove the code from this app that has moved into utils.

app/utils.py

@@ -32,84 +32,6 @@ class BrowsableItem(object):
         pass
 
 
-class InvalidEmailError(Exception):
-    def __init__(self, message):
-        self.message = message
-
-
-class InvalidPhoneError(Exception):
-    def __init__(self, message):
-        self.message = message
-
-
-class InvalidHeaderError(Exception):
-    def __init__(self, message):
-        self.message = message
-
-
-def validate_phone_number(number):
-    sanitised_number = number.replace('(', '')
-    sanitised_number = sanitised_number.replace(')', '')
-    sanitised_number = sanitised_number.replace(' ', '')
-    sanitised_number = sanitised_number.replace('-', '')
-
-    if sanitised_number.startswith('+'):
-        sanitised_number = sanitised_number[1:]
-
-    valid_prefixes = ['07', '447', '4407', '00447']
-    if not sum(sanitised_number.startswith(prefix) for prefix in valid_prefixes):
-        raise InvalidPhoneError('Must be a UK mobile number (eg 07700 900460)')
-
-    for digit in sanitised_number:
-        try:
-            int(digit)
-        except(ValueError):
-            raise InvalidPhoneError('Must not contain letters or symbols')
-
-    # Split number on first 7
-    sanitised_number = sanitised_number.split('7', 1)[1]
-
-    if len(sanitised_number) > 9:
-        raise InvalidPhoneError('Too many digits')
-
-    if len(sanitised_number) < 9:
-        raise InvalidPhoneError('Not enough digits')
-
-    return sanitised_number
-
-
-def format_phone_number(number):
-    import re
-    if len(number) > 9:
-        raise InvalidPhoneError('Too many digits')
-
-    if len(number) < 9:
-        raise InvalidPhoneError('Not enough digits')
-    return '+447{}{}{}'.format(*re.findall('...', number))
-
-
-def validate_email_address(email_address):
-    if re.match(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", email_address):
-        return
-    raise InvalidEmailError('Not a valid email address')
-
-
-def validate_recipient(row, template_type):
-    validate_header_row(row, template_type)
-    return {
-        'email': validate_email_address,
-        'sms': validate_phone_number
-    }[template_type](get_recipient_from_row(row, template_type))
-
-
-def validate_header_row(row, template_type):
-    try:
-        column_heading = first_column_heading[template_type]
-        row[column_heading]
-    except KeyError as e:
-        raise InvalidHeaderError('Invalid header name, should be {}'.format(column_heading))
-
-
 def user_has_permissions(*permissions, or_=False):
     def wrap(func):
         @wraps(func)

requirements.txt

@@ -14,4 +14,4 @@ Pygments==2.0.2
 
 git+https://github.com/alphagov/notifications-python-client.git@0.3.1#egg=notifications-python-client==0.3.1
 
-git+https://github.com/alphagov/notifications-utils.git@1.0.0#egg=notifications-utils==1.0.0
+git+https://github.com/alphagov/notifications-utils.git@2.0.0#egg=notifications-utils==2.0.0