projects
/
theonering
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing some phone number handling bugs
[theonering]
/
src
/
util
/
misc.py
diff --git
a/src/util/misc.py
b/src/util/misc.py
index
fba0abf
..
ba5f506
100644
(file)
--- a/
src/util/misc.py
+++ b/
src/util/misc.py
@@
-656,12
+656,26
@@
def normalize_number(prettynumber):
'+13456789000'
"""
uglynumber = re.sub('[^0-9+]', '', prettynumber)
'+13456789000'
"""
uglynumber = re.sub('[^0-9+]', '', prettynumber)
- if uglynumber.startswith("1") and len(uglynumber) == 11:
+ if uglynumber.startswith("+"):
+ pass
+ elif uglynumber.startswith("1") and len(uglynumber) == 11:
uglynumber = "+"+uglynumber
elif len(uglynumber) == 10:
uglynumber = "+1"+uglynumber
uglynumber = "+"+uglynumber
elif len(uglynumber) == 10:
uglynumber = "+1"+uglynumber
+ else:
+ pass
#validateRe = re.compile("^\+?[0-9]{10,}$")
#assert validateRe.match(uglynumber) is not None
return uglynumber
#validateRe = re.compile("^\+?[0-9]{10,}$")
#assert validateRe.match(uglynumber) is not None
return uglynumber
+
+
+_VALIDATE_RE = re.compile("^\+?[0-9]{10,}$")
+
+
+def is_valid_number(number):
+ """
+ @returns If This number be called ( syntax validation only )
+ """
+ return _VALIDATE_RE.match(number) is not None