From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 22 Mar 2008 01:20:40 +0000 (+0000)
Subject: unicode->str.
X-Git-Tag: v3.0a4~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0272aa6e94256829b038ac8e50231c1873321f1;p=thirdparty%2FPython%2Fcpython.git

unicode->str.
---

diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py
index 661705420375..52e84084c479 100644
--- 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 0faa4ea53730..7adf64372067 100644
--- 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