Use unicode and remove support for some uses of str8.
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 19bb149..fbb9fba 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -66,17 +66,12 @@
 	d = ((PyModuleObject *)m)->md_dict;
 	if (d == NULL ||
 	    (nameobj = PyDict_GetItemString(d, "__name__")) == NULL ||
-	    !(PyString_Check(nameobj) || PyUnicode_Check(nameobj)))
+	    !PyUnicode_Check(nameobj))
 	{
 		PyErr_SetString(PyExc_SystemError, "nameless module");
 		return NULL;
 	}
-        if (PyUnicode_Check(nameobj)) {
-		nameobj = _PyUnicode_AsDefaultEncodedString(nameobj, NULL);
-		if (nameobj == NULL)
-			return NULL;
-	}
-	return PyString_AsString(nameobj);
+	return PyUnicode_AsString(nameobj);
 }
 
 const char *