Browse Source

u2ascii: handle unicode and non-unicode strings

Darren Ranalli 15 years ago
parent
commit
5da54c6164
1 changed files with 4 additions and 1 deletions
  1. 4 1
      direct/src/showbase/PythonUtil.py

+ 4 - 1
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