Rip out all the u"..." literals and calls to unicode().

command/bdist_wininst.py

@@ -247,11 +247,11 @@ class bdist_wininst (Command):
 
         # Convert cfgdata from unicode to ascii, mbcs encoded
         try:
-            unicode
+            str
         except NameError:
             pass
         else:
-            if isinstance(cfgdata, unicode):
+            if isinstance(cfgdata, str):
                 cfgdata = cfgdata.encode("mbcs")
 
         # Append the pre-install script

command/build_clib.py

@@ -147,7 +147,7 @@ class build_clib (Command):
                 raise DistutilsSetupError, \
                       "each element of 'libraries' must a 2-tuple"
 
-            if isinstance(lib[0], basestring) StringType:
+            if isinstance(lib[0], basestring):
                 raise DistutilsSetupError, \
                       "first element of each tuple in 'libraries' " + \
                       "must be a string (the library name)"

command/register.py

@@ -259,7 +259,7 @@ Your selection [default 1]: ''', end=' ')
             if type(value) not in (type([]), type( () )):
                 value = [value]
             for value in value:
-                value = unicode(value).encode("utf-8")
+                value = str(value).encode("utf-8")
                 body.write(sep_boundary)
                 body.write('\nContent-Disposition: form-data; name="%s"'%key)
                 body.write("\n\n")