Fix for cProfile.

SF patch# 1755176 by Amaury Forgeot d'Arc.

Author: gvanrossum

Lib/cProfile.py

@@ -153,7 +153,7 @@ def runcall(self, func, *args, **kw):
 # ____________________________________________________________
 
 def label(code):
-    if isinstance(code, str):
+    if isinstance(code, basestring):
         return ('~', 0, code)    # built-in functions ('~' sorts at the end)
     else:
         return (code.co_filename, code.co_firstlineno, code.co_name)

Modules/_lsprof.c

@@ -182,6 +182,9 @@ normalizeUserObj(PyObject *obj)
 		if (mod && PyString_Check(mod)) {
 			modname = PyString_AS_STRING(mod);
 		}
+		else if (mod && PyUnicode_Check(mod)) {
+			modname = PyUnicode_AsString(mod);
+		}
 		else if (mod && PyModule_Check(mod)) {
 			modname = PyModule_GetName(mod);
 			if (modname == NULL) {