1 files changed, 46 insertions, 25 deletions
diff --git a/tools/py3tool.py b/tools/py3tool.py
index 7ac7fcb71..c9543294d 100755
--- a/tools/py3tool.py
+++ b/tools/py3tool.py
@@ -42,38 +42,59 @@ EXTRA_2TO3_FLAGS = {
     'numpy/ma/timer_comparison.py': 'skip',
 }
 
-# Names of fixers to skip when running 2to3
+# Names of fixers to skip when running 2to3.  This is a complete list of
+# available fixers, with fixers not currently skipped commented out.
 FIXES_TO_SKIP = [
-    'tuple_params',
-    'throw',
-    'sys_exc',
-    'standarderror',
-    'reduce',
-    'raise',
-    'paren',
-    'operator',
-    'ne',
-    'methodattrs',
-    'metaclass',
-    'intern',
-    'has_key',
-    'getcwdu',
-    'filter',
-    'exitfunc',
-    'execfile',
-    'exec',
-    'callable',
     'apply',
-    'input',
-    'raw_input',
-    'xreadlines',
-    'xrange',
+#    'basestring',
+#    'buffer',
+    'callable',
+    'dict',
+    'exec',
+    'execfile',
+    'exitfunc',
+    'filter',
+#    'funcattrs',
+#    'future',
+    'getcwdu',
+    'has_key',
+#    'idioms',
     'import',
     'imports',
     'imports2',
+    'input',
+    'intern',
+#    'isinstance',
+#    'itertools',
+#    'itertools_imports',
+#    'long',
+    'map',
+    'metaclass',
+    'methodattrs',
+    'ne',
+#    'next',
+#    'nonzero',
+#    'numliterals',
+    'operator',
+    'paren',
     'print',
-    'dict',
+    'raise',
+    'raw_input',
+    'reduce',
+#    'renames',
     'repr',
+#    'setliteral',
+    'standarderror',
+    'sys_exc',
+    'throw',
+    'tuple_params',
+#    'types',
+#    'unicode',
+#    'urllib',
+#    'ws_comma',
+    'xrange',
+    'xreadlines',
+#    'zip',
 ]
 
 skip_fixes= []