mercurial/subrepo.py

--- a/mercurial/subrepo.py	Sat Jul 09 14:28:30 2016 +0900
+++ b/mercurial/subrepo.py	Mon Jul 11 21:40:02 2016 +0900
@@ -56,9 +56,9 @@
 class SubrepoAbort(error.Abort):
     """Exception class used to avoid handling a subrepo error more than once"""
     def __init__(self, *args, **kw):
+        self.subrepo = kw.pop('subrepo', None)
+        self.cause = kw.pop('cause', None)
         error.Abort.__init__(self, *args, **kw)
-        self.subrepo = kw.get('subrepo')
-        self.cause = kw.get('cause')
 
 def annotatesubrepoerror(func):
     def decoratedmethod(self, *args, **kargs):