Add back stack location to gclient exceptions.

gclient_utils.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 453 matching lines @@
             break
         if not self.queued and not self.running:
           break
         # We need to poll here otherwise Ctrl-C isn't processed.
         self.ready_cond.wait(10)
         # Something happened: self.enqueue() or a thread terminated. Loop again.
     finally:
       self.ready_cond.release()
     assert not self.running, 'Now guaranteed to be single-threaded'
     if self.exceptions:
-      # TODO(maruel): Get back the original stack location.
-      raise self.exceptions.pop(0)
+      # To get back the stack location correctly, the raise a, b, c form must be
+      # used, passing a tuple as the first argument doesn't work.
+      e = self.exceptions.pop(0)
+      raise e[0], e[1], e[2]
     if self.progress:
       self.progress.end()
 
   class _Worker(threading.Thread):
     """One thread to execute one WorkItem."""
     def __init__(self, parent, item, args=(), kwargs=None):
       threading.Thread.__init__(self, name=item.name or 'Worker')
       self.args = args
       self.kwargs = kwargs or {}
       self.item = item
       self.parent = parent
 
     def run(self):
       """Runs in its own thread."""
       logging.debug('running(%s)' % self.item.name)
       exception = None
       try:
         self.item.run(*self.args, **self.kwargs)
-      except Exception, e:
-        # TODO(maruel): Catch exception location.
-        exception = e
+      except Exception:
+        # Catch exception location.
+        exception = sys.exc_info()
 
       # This assumes the following code won't throw an exception. Bad.
       self.parent.ready_cond.acquire()
       try:
         if exception:
           self.parent.exceptions.append(exception)
         if self.parent.progress:
           self.parent.progress.update(1)
         assert not self.item.name in self.parent.ran
         if not self.item.name in self.parent.ran:
           self.parent.ran.append(self.item.name)
       finally:
         self.parent.ready_cond.notifyAll()
         self.parent.ready_cond.release()