Merge pull request #2158 from Carreau/tuple_params

Remove tuple auto unpack in function definition 

This is for 2to3 compatibility., and also deactivate the application of 
the corresponding 2to3 fix when using python3 and setup.py.

IPython/core/ultratb.py

@@ -1205,7 +1205,8 b' class SyntaxTB(ListTB):'
 #----------------------------------------------------------------------------
 # module testing (minimal)
 if __name__ == "__main__":
-    def spam(c, (d, e)):
+    def spam(c, d_e):
+        (d, e) = d_e
         x = c + d
         y = c * d
         foo(x, y)

IPython/utils/PyColorize.py

@@ -204,10 +204,10 b' class Parser:'
             return (output, error)
         return (None, error)
 
-    def __call__(self, toktype, toktext, (srow,scol), (erow,ecol), line):
+    def __call__(self, toktype, toktext, start_pos, end_pos, line):
         """ Token handler, with syntax highlighting."""
-
-        # local shorthands
+        (srow,scol) = start_pos
+        (erow,ecol) = end_pos
         colors = self.colors
         owrite = self.out.write
 

setup.py

@@ -274,6 +274,7 b" if 'setuptools' in sys.modules:"
                 'lib2to3.fixes.fix_has_key',
                 'lib2to3.fixes.fix_next',
                 'lib2to3.fixes.fix_repr',
+                'lib2to3.fixes.fix_tuple_params',
                 ]
         from setuptools.command.build_py import build_py
         setup_args['cmdclass'] = {'build_py': record_commit_info('IPython', build_cmd=build_py)}