From 5da54c6164f16a571ee98784565452be2a8ee5ea Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Sat, 5 Jun 2010 01:34:04 +0000 Subject: [PATCH] u2ascii: handle unicode and non-unicode strings --- direct/src/showbase/PythonUtil.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py index 293ee5ad72..291445221a 100644 --- a/direct/src/showbase/PythonUtil.py +++ b/direct/src/showbase/PythonUtil.py @@ -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