import sys
from lib2to3 import refactor


lib2to3_fix_names = set([
    'lib2to3.fixes.fix_apply',
    'lib2to3.fixes.fix_basestring',
    # 'lib2to3.fixes.fix_buffer',
    # 'lib2to3.fixes.fix_callable',
    'lib2to3.fixes.fix_dict',
    'lib2to3.fixes.fix_except',
    'lib2to3.fixes.fix_exec',
    'lib2to3.fixes.fix_execfile',
    'lib2to3.fixes.fix_exitfunc',
    'lib2to3.fixes.fix_filter',
    'lib2to3.fixes.fix_funcattrs',
    # 'lib2to3.fixes.fix_future',
    'lib2to3.fixes.fix_getcwdu',
    'lib2to3.fixes.fix_has_key',
    'lib2to3.fixes.fix_idioms',
    'lib2to3.fixes.fix_import',
    'lib2to3.fixes.fix_imports',
    '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_metaclass',
    'lib2to3.fixes.fix_methodattrs',
    'lib2to3.fixes.fix_ne',
    'lib2to3.fixes.fix_next',
    'lib2to3.fixes.fix_nonzero',
    'lib2to3.fixes.fix_numliterals',
    # 'lib2to3.fixes.fix_operator',  - what is this?
    'lib2to3.fixes.fix_paren',
    'lib2to3.fixes.fix_print',
    'lib2to3.fixes.fix_raise',
    'lib2to3.fixes.fix_raw_input',
    'lib2to3.fixes.fix_reduce',
    'lib2to3.fixes.fix_renames',
    'lib2to3.fixes.fix_repr',
    'lib2to3.fixes.fix_set_literal',
    '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_unicode',
    'lib2to3.fixes.fix_urllib',
    'lib2to3.fixes.fix_ws_comma',
    'lib2to3.fixes.fix_xrange',
    'lib2to3.fixes.fix_xreadlines',
    'lib2to3.fixes.fix_zip',
])

future_package_fix_names = set([
    'libfuturize.fixes.fix_future_package',
    'libfuturize.fixes.fix_metaclass',
    # 'libfuturize.fixes.fix_print',
    # 'libfuturize.fixes.fix_',
    ])

@@ -157,24 +157,56 @@
 fix_buffer',
+  # perhaps not safe. Test this.
 %0A    # 'lib2
@@ -225,24 +225,46 @@
 x_callable',
+# not needed in Py3.2+
 %0A    'lib2to
@@ -642,16 +642,71 @@
 import',
+    # use together with absolute_import from __future__
 %0A    'li
@@ -999,24 +999,86 @@
 _metaclass',
+ # causes SyntaxError in Py2! Use the one from %60%60six%60%60 instead
 %0A    'lib2to
@@ -1230,26 +1230,24 @@
 terals',%0A   
- #
  'lib2to3.fi
@@ -1270,23 +1270,116 @@
 ',  
-- what is this?
+ # we will need support for this by e.g. extending the Py2 operator module to provide those functions in Py3
 %0A   
@@ -2080,24 +2080,24 @@
 e_package',%0A
+
     'libfutu
@@ -2127,77 +2127,8 @@
 s',%0A
-    # 'libfuturize.fixes.fix_print',%0A    # 'libfuturize.fixes.fix_',%0A
     

Improve comments in libfuturize.fixes