From a0272aa6e94256829b038ac8e50231c1873321f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 22 Mar 2008 01:20:40 +0000 Subject: unicode->str. --- Lib/lib2to3/fixes/fix_import.py | 4 ++-- Lib/lib2to3/fixes/fix_itertools_imports.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py index 6617054..52e8408 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 0faa4ea..7adf643 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 -- cgit v0.12