Make gclient_utils.CheckCallError inherit from subprocess2.CalledProcessError.

gclient_utils.py

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generic utils."""
 
 import errno
 import logging
 import os
 import Queue
 import re
 import stat
 import subprocess
 import sys
 import threading
 import time
 
+import subprocess2
+
 
 def hack_subprocess():
   """subprocess functions may throw exceptions when used in multiple threads.
 
   See http://bugs.python.org/issue1731717 for more information.
   """
   subprocess._cleanup = lambda: None
 
 
 class Error(Exception):
   """gclient exception class."""
   pass
 
 
-class CheckCallError(OSError, Error):
+class CheckCallError(subprocess2.CalledProcessError, Error):
   """CheckCall() returned non-0."""
-  def __init__(self, command, cwd, returncode, stdout, stderr=None):
-    OSError.__init__(self, command, cwd, returncode)
-    Error.__init__(self, command)
-    self.command = command
-    self.cwd = cwd
-    self.returncode = returncode
-    self.stdout = stdout
-    self.stderr = stderr
+  def __init__(self, cmd, cwd, returncode, stdout, stderr=None):
+    subprocess2.CalledProcessError.__init__(
+        self, returncode, cmd, cwd, stdout, stderr)
+    Error.__init__(self, cmd)
 
   def __str__(self):
-    out = ' '.join(self.command)
-    if self.cwd:
-      out += ' in ' + self.cwd
-    if self.returncode is not None:
-      out += ' returned %d' % self.returncode
-    if self.stdout is not None:
-      out += '\nstdout: %s\n' % self.stdout
-    if self.stderr is not None:
-      out += '\nstderr: %s\n' % self.stderr
-    return out
+    return subprocess2.CalledProcessError.__str__(self)
 
 
 def Popen(args, **kwargs):
   """Calls subprocess.Popen() with hacks to work around certain behaviors.
 
   Ensure English outpout for svn and make it work reliably on Windows.
   """
   logging.debug(u'%s, cwd=%s' % (u' '.join(args), kwargs.get('cwd', '')))
   if not 'env' in kwargs:
     # It's easier to parse the stdout if it is always in English.
@@ skipping 627 matching lines @@
         logging.info('Caught exception in thread %s' % self.item.name)
         logging.info(str(sys.exc_info()))
         work_queue.exceptions.put(sys.exc_info())
       logging.info('Task %s done' % self.item.name)
 
       work_queue.ready_cond.acquire()
       try:
         work_queue.ready_cond.notifyAll()
       finally:
         work_queue.ready_cond.release()