unicode->str.

diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py
index 661705420375b14deed5b3e1f48570f11510a6b3..52e84084c479d1be3a4c69f406a30b69afebec43 100644 (file)
--- a/Lib/lib2to3/fixes/fix_import.py
+++ b/Lib/lib2to3/fixes/fix_import.py
@@ -25,11 +25,11 @@ class FixImport(basefix.BaseFix):
     def transform(self, node, results):
         imp = results['imp']
 
-        if unicode(imp).startswith('.'):
+        if str(imp).startswith('.'):
             # Already a new-style import
             return
 
-        if not probably_a_local_import(unicode(imp), self.filename):
+        if not probably_a_local_import(str(imp), self.filename):
             # I guess this is a global import -- skip it!
             return
 

diff --git a/Lib/lib2to3/fixes/fix_itertools_imports.py b/Lib/lib2to3/fixes/fix_itertools_imports.py
index 0faa4ea5373044ee989d06759bcf792a0ca168aa..7adf6437206780198f892002e99719cea771dbfd 100644 (file)
--- a/Lib/lib2to3/fixes/fix_itertools_imports.py
+++ b/Lib/lib2to3/fixes/fix_itertools_imports.py
@@ -31,7 +31,7 @@ class FixItertoolsImports(basefix.BaseFix):
             else:
                 remove_comma ^= True
 
-        if unicode(children[-1]) == ',':
+        if str(children[-1]) == ',':
             children[-1].remove()
 
         # If there is nothing left, return a blank line