u2ascii: handle unicode and non-unicode strings

This commit is contained in:
Darren Ranalli 2010-06-05 01:34:04 +00:00
parent b539af35b7
commit 5da54c6164
1 changed files with 4 additions and 1 deletions

View File

@ -4324,7 +4324,10 @@ bpdb.setEnabledCallback(bpdbGetEnabled)
bpdb.setConfigCallback(lambda cfg: ConfigVariableBool('want-bp-%s' % (cfg.lower(),), 0).getValue())
def u2ascii(str):
return unicodedata.normalize('NFKD', str).encode('ascii','ignore')
if type(str) is types.UnicodeType:
return unicodedata.normalize('NFKD', str).encode('ascii','ignore')
else:
return str
import __builtin__
__builtin__.Functor = Functor