Convert old-style exception handling to current format in fix_encoding.py.

fix_encoding.py

 # Copyright (c) 2011 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.
 
 """Collection of functions and classes to fix various encoding problems on
 multiple platforms with python.
 """
 
 import codecs
 import locale
@@ skipping 153 matching lines @@
   def flush(self):
     raise NotImplementedError()
 
   def write(self, text):
     raise NotImplementedError()
 
   def writelines(self, lines):
     try:
       for line in lines:
         self.write(line)
-    except Exception, e:
+    except Exception as e:
       complain('%s.writelines: %r' % (self.name, e))
       raise
 
 
 class WinUnicodeConsoleOutput(WinUnicodeOutputBase):
   """Output adapter to a Windows Console.
 
   Understands how to use the win32 console API.
   """
   def __init__(self, console_handle, fileno, stream_name, encoding):
@@ skipping 38 matching lines @@
             min(remaining, 10000),
             self._byref(n), None)
         if retval == 0 or n.value == 0:
           raise IOError(
               'WriteConsoleW returned %r, n.value = %r, last error = %r' % (
                 retval, n.value, self._GetLastError()))
         remaining -= n.value
         if not remaining:
           break
         text = text[int(n.value):]
-    except Exception, e:
+    except Exception as e:
       complain('%s.write: %r' % (self.name, e))
       raise
 
 
 class WinUnicodeOutput(WinUnicodeOutputBase):
   """Output adaptor to a file output on Windows.
 
   If the standard FileWrite function is used, it will be encoded in the current
   code page. WriteConsoleW() permits writting any character.
   """
   def __init__(self, stream, fileno, encoding):
     super(WinUnicodeOutput, self).__init__(
         fileno, '<Unicode redirected %s>' % stream.name, encoding)
     # Output stream
     self._stream = stream
 
     # Flush right now.
     self.flush()
 
   def flush(self):
     try:
       self._stream.flush()
-    except Exception, e:
+    except Exception as e:
       complain('%s.flush: %r from %r' % (self.name, e, self._stream))
       raise
 
   def write(self, text):
     try:
       if isinstance(text, unicode):
         # Replace characters that cannot be printed instead of failing.
         text = text.encode(self.encoding, 'replace')
       self._stream.write(text)
-    except Exception, e:
+    except Exception as e:
       complain('%s.write: %r' % (self.name, e))
       raise
 
 
 def win_handle_is_a_console(handle):
   """Returns True if a Windows file handle is a handle to a console."""
   # These types are available on linux but not Mac.
   # pylint: disable=E0611,F0401
   from ctypes import byref, POINTER, windll, WINFUNCTYPE
   from ctypes.wintypes import BOOL, DWORD, HANDLE
@@ skipping 64 matching lines @@
     # reverted manually.
     # In practice one needs to set the console font to a TTF font to be able to
     # see all the characters but it failed for me in practice. In any case, it
     # won't throw any exception when printing, which is the important part.
     # -11 and -12 are defined in stdio.h
     sys.stdout = win_get_unicode_stream(sys.stdout, 1, -11, encoding)
     sys.stderr = win_get_unicode_stream(sys.stderr, 2, -12, encoding)
     # TODO(maruel): Do sys.stdin with ReadConsoleW(). Albeit the limitation is
     # "It doesn't appear to be possible to read Unicode characters in UTF-8
     # mode" and this appears to be a limitation of cmd.exe.
-  except Exception, e:
+  except Exception as e:
     complain('exception %r while fixing up sys.stdout and sys.stderr' % e)
   return True
 
 
 def fix_encoding():
   """Fixes various encoding problems on all platforms.
 
   Should be called at the very begining of the process.
   """
   ret = True
   if sys.platform == 'win32':
     ret &= fix_win_codec()
 
   ret &= fix_default_encoding()
 
   if sys.platform == 'win32':
     encoding = sys.getdefaultencoding()
     ret &= fix_win_sys_argv(encoding)
     ret &= fix_win_console(encoding)
   return ret