test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2 from notcarl/master 

Changed phone2numeric to use generator expressions instead of lambdas
This commit is contained in:
Adrian Holovaty 2012-04-28 12:11:56 -07:00
parent 80d32b51b0 6b430b883f
commit 50b0984a8b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
django/utils/text.py
View File

@ -266,13 +266,12 @@ recapitalize = allow_lazy(recapitalize)
def phone2numeric(phone): def phone2numeric(phone):
"Converts a phone number with letters into its numeric equivalent." "Converts a phone number with letters into its numeric equivalent."
letters = re.compile(r'[A-Z]', re.I) char2number = {'a': '2', 'b': '2', 'c': '2', 'd': '3', 'e': '3', 'f': '3',
char2number = lambda m: {'a': '2', 'b': '2', 'c': '2', 'd': '3', 'e': '3', 'g': '4', 'h': '4', 'i': '4', 'j': '5', 'k': '5', 'l': '5', 'm': '6',
'f': '3', 'g': '4', 'h': '4', 'i': '4', 'j': '5', 'k': '5', 'l': '5', 'n': '6', 'o': '6', 'p': '7', 'q': '7', 'r': '7', 's': '7', 't': '8',
'm': '6', 'n': '6', 'o': '6', 'p': '7', 'q': '7', 'r': '7', 's': '7', 'u': '8', 'v': '8', 'w': '9', 'x': '9', 'y': '9', 'z': '9',
't': '8', 'u': '8', 'v': '8', 'w': '9', 'x': '9', 'y': '9', 'z': '9', }
}.get(m.group(0).lower()) return u''.join(char2number.get(c, c) for c in phone.lower())
return letters.sub(char2number, phone)
phone2numeric = allow_lazy(phone2numeric) phone2numeric = allow_lazy(phone2numeric)
# From http://www.xhaus.com/alan/python/httpcomp.html#gzip # From http://www.xhaus.com/alan/python/httpcomp.html#gzip