From 9ff624471d8cf67b5d4cdc6ed8a0ed7fd9dafecc Mon Sep 17 00:00:00 2001
From: "Bradley M. Froehle" <brad.froehle@gmail.com>
Date: Thu, 12 Jul 2012 17:54:22 -0700
Subject: [PATCH] Skip `has_key` when running 2to3.

---
 setup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 9074f3865..42d02d4f2 100755
--- a/setup.py
+++ b/setup.py
@@ -269,10 +269,11 @@ if 'setuptools' in sys.modules:
         # so we explicitly disable some 2to3 fixes to be sure we aren't forgetting
         # anything.
         setuptools_extra_args['use_2to3_exclude_fixers'] = [
-                'lib2to3.fixes.fix_except',
                 'lib2to3.fixes.fix_apply',
-                'lib2to3.fixes.fix_repr',
+                'lib2to3.fixes.fix_except',
+                'lib2to3.fixes.fix_has_key',
                 'lib2to3.fixes.fix_next',
+                'lib2to3.fixes.fix_repr',
                 ]
         from setuptools.command.build_py import build_py
         setup_args['cmdclass'] = {'build_py': record_commit_info('IPython', build_cmd=build_py)}