Rename retcode to returncode to be consistent with subprocess.

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,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 """Generic utils."""
 
 import errno
 import logging
 import os
 import re
 import stat
 import subprocess
 import sys
 import threading
 import time
 import xml.dom.minidom
 import xml.parsers.expat
 
 
-class CheckCallError(OSError):
+class Error(Exception):
+  """gclient exception class."""
+  pass
+
+
+class CheckCallError(OSError, Error):
   """CheckCall() returned non-0."""
-  def __init__(self, command, cwd, retcode, stdout, stderr=None):
-    OSError.__init__(self, command, cwd, retcode, stdout, stderr)
+  def __init__(self, command, cwd, returncode, stdout, stderr=None):
+    OSError.__init__(self, command, cwd, returncode, stdout, stderr)
+    Error.__init__(self)
     self.command = command
     self.cwd = cwd
-    self.retcode = retcode
+    self.returncode = returncode
     self.stdout = stdout
     self.stderr = stderr
 
 
 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', '')))
@@ skipping 57 matching lines @@
 
 
 def GetNodeNamedAttributeText(node, node_name, attribute_name):
   child_nodes = node.getElementsByTagName(node_name)
   if not child_nodes:
     return None
   assert len(child_nodes) == 1
   return child_nodes[0].getAttribute(attribute_name)
 
 
-class Error(Exception):
-  """gclient exception class."""
-  # TODO(maruel): Merge with CheckCallError.
-  pass
-
-
 def SyntaxErrorToError(filename, e):
   """Raises a gclient_utils.Error exception with the human readable message"""
   try:
     # Try to construct a human readable error message
     if filename:
       error_message = 'There is a syntax error in %s\n' % filename
     else:
       error_message = 'There is a syntax error\n'
     error_message += 'Line #%s, character %s: "%s"' % (
         e.lineno, e.offset, re.sub(r'[\r\n]*$', '', e.text))
@@ skipping 395 matching lines @@
         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()