2to3: add fixes

jef-n · jef-n · commit fb9d60d7c69c · 2016-03-20T16:31:05.000+01:00
diff --git a/scripts/addfix.pl b/scripts/addfix.pl
@@ -0,0 +1,76 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+for my $fix (qw/
+lib2to3.fixes.fix_apply
+lib2to3.fixes.fix_basestring
+lib2to3.fixes.fix_dict
+lib2to3.fixes.fix_except
+lib2to3.fixes.fix_exec
+lib2to3.fixes.fix_exitfunc
+lib2to3.fixes.fix_filter
+lib2to3.fixes.fix_funcattrs
+lib2to3.fixes.fix_getcwdu
+lib2to3.fixes.fix_has_key
+lib2to3.fixes.fix_idioms
+lib2to3.fixes.fix_input
+lib2to3.fixes.fix_intern
+lib2to3.fixes.fix_isinstance
+lib2to3.fixes.fix_itertools
+lib2to3.fixes.fix_itertools_imports
+lib2to3.fixes.fix_long
+lib2to3.fixes.fix_map
+lib2to3.fixes.fix_methodattrs
+lib2to3.fixes.fix_ne
+lib2to3.fixes.fix_nonzero
+lib2to3.fixes.fix_numliterals
+lib2to3.fixes.fix_operator
+lib2to3.fixes.fix_paren
+lib2to3.fixes.fix_raw_input
+lib2to3.fixes.fix_reduce
+lib2to3.fixes.fix_renames
+lib2to3.fixes.fix_repr
+lib2to3.fixes.fix_standarderror
+lib2to3.fixes.fix_sys_exc
+lib2to3.fixes.fix_throw
+lib2to3.fixes.fix_tuple_params
+lib2to3.fixes.fix_types
+lib2to3.fixes.fix_ws_comma
+lib2to3.fixes.fix_xreadlines
+lib2to3.fixes.fix_zip
+
+libfuturize.fixes.fix_absolute_import
+libfuturize.fixes.fix_cmp
+libfuturize.fixes.fix_execfile
+libfuturize.fixes.fix_future_builtins
+libfuturize.fixes.fix_future_standard_library
+libfuturize.fixes.fix_future_standard_library_urllib
+libfuturize.fixes.fix_metaclass
+libfuturize.fixes.fix_next_call
+libfuturize.fixes.fix_object
+libfuturize.fixes.fix_print_with_import
+libfuturize.fixes.fix_raise
+libfuturize.fixes.fix_xrange_with_import
+
+libpasteurize.fixes.fix_division
+libpasteurize.fixes.fix_newstyle
+/) {
+	my($f) = $fix =~ /\.(fix_.*)$/;
+	next if -f "scripts/qgis_fixes/$f.py";
+
+	my $p = $fix;
+	$p =~ s#\.#/#g;
+
+	open F, "/usr/lib/python2.7/$p.py" or open F, "/usr/lib/python2.7/dist-packages/$p.py" or die "$p not found";
+	my $c;
+	while(<F>) {
+		last if ($c) = /^class (Fix[^(:]+)[(:]/;
+	}
+	close F;
+
+	print "$p.py => scripts/qgis_fixes/$f.py\n";
+	open F, ">scripts/qgis_fixes/$f.py";
+	print F "from $fix import $c\n";
+	close F;
+}
diff --git a/scripts/qgis_fixes/fix_absolute_import.py b/scripts/qgis_fixes/fix_absolute_import.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_absolute_import import FixAbsoluteImport
diff --git a/scripts/qgis_fixes/fix_apply.py b/scripts/qgis_fixes/fix_apply.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_apply import FixApply
diff --git a/scripts/qgis_fixes/fix_basestring.py b/scripts/qgis_fixes/fix_basestring.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_basestring import FixBasestring
diff --git a/scripts/qgis_fixes/fix_cmp.py b/scripts/qgis_fixes/fix_cmp.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_cmp import FixCmp
diff --git a/scripts/qgis_fixes/fix_division.py b/scripts/qgis_fixes/fix_division.py
@@ -0,0 +1 @@
+from libpasteurize.fixes.fix_division import FixDivision
diff --git a/scripts/qgis_fixes/fix_except.py b/scripts/qgis_fixes/fix_except.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_except import FixExcept
diff --git a/scripts/qgis_fixes/fix_exec.py b/scripts/qgis_fixes/fix_exec.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_exec import FixExec
diff --git a/scripts/qgis_fixes/fix_execfile.py b/scripts/qgis_fixes/fix_execfile.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_execfile import FixExecfile
diff --git a/scripts/qgis_fixes/fix_exitfunc.py b/scripts/qgis_fixes/fix_exitfunc.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_exitfunc import FixExitfunc
diff --git a/scripts/qgis_fixes/fix_filter.py b/scripts/qgis_fixes/fix_filter.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_filter import FixFilter
diff --git a/scripts/qgis_fixes/fix_funcattrs.py b/scripts/qgis_fixes/fix_funcattrs.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_funcattrs import FixFuncattrs
diff --git a/scripts/qgis_fixes/fix_future_builtins.py b/scripts/qgis_fixes/fix_future_builtins.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_future_builtins import FixFutureBuiltins
diff --git a/scripts/qgis_fixes/fix_future_standard_library.py b/scripts/qgis_fixes/fix_future_standard_library.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_future_standard_library import FixFutureStandardLibrary
diff --git a/scripts/qgis_fixes/fix_future_standard_library_urllib.py b/scripts/qgis_fixes/fix_future_standard_library_urllib.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_future_standard_library_urllib import FixFutureStandardLibraryUrllib
diff --git a/scripts/qgis_fixes/fix_getcwdu.py b/scripts/qgis_fixes/fix_getcwdu.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_getcwdu import FixGetcwdu
diff --git a/scripts/qgis_fixes/fix_has_key.py b/scripts/qgis_fixes/fix_has_key.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_has_key import FixHasKey
diff --git a/scripts/qgis_fixes/fix_idioms.py b/scripts/qgis_fixes/fix_idioms.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_idioms import FixIdioms
diff --git a/scripts/qgis_fixes/fix_imports.py b/scripts/qgis_fixes/fix_imports.py
diff --git a/scripts/qgis_fixes/fix_input.py b/scripts/qgis_fixes/fix_input.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_input import FixInput
diff --git a/scripts/qgis_fixes/fix_intern.py b/scripts/qgis_fixes/fix_intern.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_intern import FixIntern
diff --git a/scripts/qgis_fixes/fix_isinstance.py b/scripts/qgis_fixes/fix_isinstance.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_isinstance import FixIsinstance
diff --git a/scripts/qgis_fixes/fix_itertools.py b/scripts/qgis_fixes/fix_itertools.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_itertools import FixItertools
diff --git a/scripts/qgis_fixes/fix_itertools_imports.py b/scripts/qgis_fixes/fix_itertools_imports.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_itertools_imports import FixItertoolsImports
diff --git a/scripts/qgis_fixes/fix_long.py b/scripts/qgis_fixes/fix_long.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_long import FixLong
diff --git a/scripts/qgis_fixes/fix_map.py b/scripts/qgis_fixes/fix_map.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_map import FixMap
diff --git a/scripts/qgis_fixes/fix_metaclass.py b/scripts/qgis_fixes/fix_metaclass.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_metaclass import FixMetaclass
diff --git a/scripts/qgis_fixes/fix_methodattrs.py b/scripts/qgis_fixes/fix_methodattrs.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_methodattrs import FixMethodattrs
diff --git a/scripts/qgis_fixes/fix_ne.py b/scripts/qgis_fixes/fix_ne.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_ne import FixNe
diff --git a/scripts/qgis_fixes/fix_newstyle.py b/scripts/qgis_fixes/fix_newstyle.py
@@ -0,0 +1 @@
+from libpasteurize.fixes.fix_newstyle import FixNewstyle
diff --git a/scripts/qgis_fixes/fix_next_call.py b/scripts/qgis_fixes/fix_next_call.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_next_call import FixNextCall
diff --git a/scripts/qgis_fixes/fix_nonzero.py b/scripts/qgis_fixes/fix_nonzero.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_nonzero import FixNonzero
diff --git a/scripts/qgis_fixes/fix_numliterals.py b/scripts/qgis_fixes/fix_numliterals.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_numliterals import FixNumliterals
diff --git a/scripts/qgis_fixes/fix_object.py b/scripts/qgis_fixes/fix_object.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_object import FixObject
diff --git a/scripts/qgis_fixes/fix_operator.py b/scripts/qgis_fixes/fix_operator.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_operator import FixOperator
diff --git a/scripts/qgis_fixes/fix_paren.py b/scripts/qgis_fixes/fix_paren.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_paren import FixParen
diff --git a/scripts/qgis_fixes/fix_print_with_import.py b/scripts/qgis_fixes/fix_print_with_import.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_print_with_import import FixPrintWithImport
diff --git a/scripts/qgis_fixes/fix_raise.py b/scripts/qgis_fixes/fix_raise.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_raise import FixRaise
diff --git a/scripts/qgis_fixes/fix_raw_input.py b/scripts/qgis_fixes/fix_raw_input.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_raw_input import FixRawInput
diff --git a/scripts/qgis_fixes/fix_reduce.py b/scripts/qgis_fixes/fix_reduce.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_reduce import FixReduce
diff --git a/scripts/qgis_fixes/fix_renames.py b/scripts/qgis_fixes/fix_renames.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_renames import FixRenames
diff --git a/scripts/qgis_fixes/fix_repr.py b/scripts/qgis_fixes/fix_repr.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_repr import FixRepr
diff --git a/scripts/qgis_fixes/fix_standarderror.py b/scripts/qgis_fixes/fix_standarderror.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_standarderror import FixStandarderror
diff --git a/scripts/qgis_fixes/fix_sys_exc.py b/scripts/qgis_fixes/fix_sys_exc.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_sys_exc import FixSysExc
diff --git a/scripts/qgis_fixes/fix_throw.py b/scripts/qgis_fixes/fix_throw.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_throw import FixThrow
diff --git a/scripts/qgis_fixes/fix_tuple_params.py b/scripts/qgis_fixes/fix_tuple_params.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_tuple_params import FixTupleParams
diff --git a/scripts/qgis_fixes/fix_types.py b/scripts/qgis_fixes/fix_types.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_types import FixTypes
diff --git a/scripts/qgis_fixes/fix_ws_comma.py b/scripts/qgis_fixes/fix_ws_comma.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_ws_comma import FixWsComma
diff --git a/scripts/qgis_fixes/fix_xrange_with_import.py b/scripts/qgis_fixes/fix_xrange_with_import.py
@@ -0,0 +1 @@
+from libfuturize.fixes.fix_xrange_with_import import FixXrangeWithImport
diff --git a/scripts/qgis_fixes/fix_xreadlines.py b/scripts/qgis_fixes/fix_xreadlines.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_xreadlines import FixXreadlines
diff --git a/scripts/qgis_fixes/fix_zip.py b/scripts/qgis_fixes/fix_zip.py
@@ -0,0 +1 @@
+from lib2to3.fixes.fix_zip import FixZip

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+from libfuturize.fixes.fix_absolute_import import FixAbsoluteImport`