Fixing some phone number handling bugs

[theonering] / src / util / misc.py

diff --git a/src/util/misc.py b/src/util/misc.py
index 85c6ca0..ba5f506 100644 (file)
--- a/src/util/misc.py
+++ b/src/util/misc.py
@@ -3,6 +3,7 @@
 from __future__ import with_statement
 
 import sys
+import re
 import cPickle
 
 import functools
@@ -230,6 +231,7 @@ def deprecated_api(func):
        def newFunc(*args, **kwargs):
                warnings.warn("Call to deprecated function %s." % func.__name__, category=DeprecationWarning)
                return func(*args, **kwargs)
+
        _append_docstring(newFunc, "\n@deprecated")
        return newFunc
 
@@ -410,6 +412,22 @@ def ExpHandler(handler = print_handler, *exceptions):
        return wrapper
 
 
+def into_debugger(func):
+       """
+       >>> validate_decorator(into_debugger)
+       """
+
+       @functools.wraps(func)
+       def newFunc(*args, **kwargs):
+               try:
+                       return func(*args, **kwargs)
+               except:
+                       import pdb
+                       pdb.post_mortem()
+
+       return newFunc
+
+
 class bindclass(object):
        """
        >>> validate_decorator(bindclass)
@@ -623,3 +641,41 @@ def lexical_scope(*args):
                for key in (x for x in f_locals.keys() if x not in saved):
                        del f_locals[key]
                del frame
+
+
+def normalize_number(prettynumber):
+       """
+       function to take a phone number and strip out all non-numeric
+       characters
+
+       >>> normalize_number("+012-(345)-678-90")
+       '+01234567890'
+       >>> normalize_number("1-(345)-678-9000")
+       '+13456789000'
+       >>> normalize_number("+1-(345)-678-9000")
+       '+13456789000'
+       """
+       uglynumber = re.sub('[^0-9+]', '', prettynumber)
+       if uglynumber.startswith("+"):
+               pass
+       elif uglynumber.startswith("1") and len(uglynumber) == 11:
+               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
+
+
+_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