darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-14 23:08:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2057 from alphagov/whitespace

Browse Source 
move strip_whitespace to utils
This commit is contained in:
Chris Hill-Scott
2018-05-08 16:55:02 +01:00
committed by GitHub
parent d261c556d0 e1b71e546b
commit e19e68396f
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/main/forms.py
View File

@@ -1,4 +1,3 @@
import string
import weakref import weakref
from datetime import datetime, timedelta from datetime import datetime, timedelta
from itertools import chain from itertools import chain
@@ -8,6 +7,7 @@ from flask_wtf import FlaskForm as Form
from flask_wtf.file import FileAllowed from flask_wtf.file import FileAllowed
from flask_wtf.file import FileField as FileField_wtf from flask_wtf.file import FileField as FileField_wtf
from notifications_utils.columns import Columns from notifications_utils.columns import Columns
from notifications_utils.formatters import strip_whitespace
from notifications_utils.recipients import ( from notifications_utils.recipients import (
InvalidPhoneError, InvalidPhoneError,
validate_phone_number, validate_phone_number,
@@ -41,15 +41,6 @@ from app.main.validators import (
ValidGovEmail, ValidGovEmail,
) )
OBSCURE_WHITESPACE = (
'\u180E' # Mongolian vowel separator
'\u200B' # zero width space
'\u200C' # zero width non-joiner
'\u200D' # zero width joiner
'\u2060' # word joiner
'\uFEFF' # zero width non-breaking space
)
def get_time_value_and_label(future_time): def get_time_value_and_label(future_time):
return ( return (
@@ -118,12 +109,6 @@ def email_address(label='Email address', gov_user=True):
return EmailField(label, validators) return EmailField(label, validators)
def strip_whitespace(value):
if value is not None and hasattr(value, 'strip'):
return value.strip(string.whitespace + OBSCURE_WHITESPACE)
return value
class UKMobileNumber(TelField): class UKMobileNumber(TelField):
def pre_validate(self, form): def pre_validate(self, form):
try: try: