Merge pull request #2331 from llllllllll/rdb-stops-in-contextlib

rdb.set_trace stops in contextlib

celery/contrib/rdb.py

@@ -46,7 +46,6 @@ from pdb import Pdb
 from billiard import current_process
 
 from celery.five import range
-from celery.platforms import ignore_errno
 
 __all__ = ['CELERY_RDB_HOST', 'CELERY_RDB_PORT', 'default_port',
            'Rdb', 'debugger', 'set_trace']
@@ -153,12 +152,6 @@ class Rdb(Pdb):
         return 1
     do_q = do_exit = do_quit
 
-    def set_trace(self, frame=None):
-        if frame is None:
-            frame = _frame().f_back
-        with ignore_errno(errno.ECONNRESET):
-            Pdb.set_trace(self, frame)
-
     def set_quit(self):
         # this raises a BdbQuit exception that we are unable to catch.
         sys.settrace(None)

celery/tests/contrib/test_rdb.py

@@ -52,8 +52,6 @@ class test_Rdb(Case):
                 rdb.set_trace()
                 rdb.set_trace(Mock())
                 pset.side_effect = SockErr
-                pset.side_effect.errno = errno.ECONNRESET
-                rdb.set_trace()
                 pset.side_effect.errno = errno.ENOENT
                 with self.assertRaises(SockErr):
                     rdb.set_trace()