Merge pull request #1932 from takluyver/i1916

Fix adding functions to CommandChainDispatcher with equal priority on Py 3

IPython/core/hooks.py

@@ -41,7 +41,7 @@ def calljed(self,filename, linenum):
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
-import os, bisect
+import os
 import subprocess
 import sys
 
@@ -146,7 +146,8 @@ def __str__(self):
 
     def add(self, func, priority=0):
         """ Add a func to the cmd chain with given priority """
-        bisect.insort(self.chain,(priority,func))
+        self.chain.append((priority, func))
+        self.chain.sort(key=lambda x: x[0])
 
     def __iter__(self):
         """ Return all objects in chain.

IPython/core/tests/test_hooks.py

@@ -73,3 +73,9 @@ def test_command_chain_dispatcher_fofo():
     nt.assert_true(okay1.called)
     nt.assert_false(fail2.called)
     nt.assert_false(okay2.called)
+
+def test_command_chain_dispatcher_eq_priority():
+    okay1 = Okay(u'okay1')
+    okay2 = Okay(u'okay2')
+    dp = CommandChainDispatcher([(1, okay1)])
+    dp.add(okay2, 1)