Style change: Rename error variables "e" -> "error"

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 394 matching lines @@
         image_diff_path = self._path_to_image_diff()
         if not self._filesystem.exists(image_diff_path):
             _log.error("image_diff was not found at %s", image_diff_path)
             return False
         return True
 
     def check_pretty_patch(self, more_logging=True):
         """Checks whether we can use the PrettyPatch ruby script."""
         try:
             _ = self._executive.run_command(['ruby', '--version'])
-        except OSError as e:
-            if e.errno in [errno.ENOENT, errno.EACCES, errno.ECHILD]:
+        except OSError as error:
+            if error.errno in [errno.ENOENT, errno.EACCES, errno.ECHILD]:
                 if more_logging:
                     _log.warning("Ruby is not installed; can't generate pretty patches.")
                     _log.warning('')
                 return False
 
         if not self._filesystem.exists(self._pretty_patch_path):
             if more_logging:
                 _log.warning("Unable to find %s; can't generate pretty patches.", self._pretty_patch_path)
                 _log.warning('')
             return False
@@ skipping 77 matching lines @@
         err_str = None
         try:
             exit_code = self._executive.run_command(command, return_exit_code=True)
             if exit_code == 0:
                 # The images are the same.
                 result = None
             elif exit_code == 1:
                 result = self._filesystem.read_binary_file(native_diff_filename)
             else:
                 err_str = "Image diff returned an exit code of %s. See http://crbug.com/278596" % exit_code
-        except OSError as e:
-            err_str = 'error running image diff: %s' % str(e)
+        except OSError as error:
+            err_str = 'error running image diff: %s' % error
         finally:
             self._filesystem.rmtree(str(tempdir))
 
         return (result, err_str or None)
 
     def diff_text(self, expected_text, actual_text, expected_filename, actual_filename):
         """Returns a string containing the diff of the two text strings
         in 'unified diff' format.
         """
 
@@ skipping 919 matching lines @@
     def wdiff_text(self, actual_filename, expected_filename):
         """Returns a string of HTML indicating the word-level diff of the
         contents of the two filenames. Returns an empty string if word-level
         diffing isn't available.
         """
         if not self.wdiff_available():
             return ""
         try:
             # It's possible to raise a ScriptError we pass wdiff invalid paths.
             return self._run_wdiff(actual_filename, expected_filename)
-        except OSError as e:
-            if e.errno in [errno.ENOENT, errno.EACCES, errno.ECHILD]:
+        except OSError as error:
+            if error.errno in (errno.ENOENT, errno.EACCES, errno.ECHILD):
                 # Silently ignore cases where wdiff is missing.
                 self._wdiff_available = False
                 return ""
             raise
-        except ScriptError as e:
-            _log.error("Failed to run wdiff: %s", e)
+        except ScriptError as error:
+            _log.error("Failed to run wdiff: %s", error)
             self._wdiff_available = False
             return self._wdiff_error_html
 
     # This is a class variable so we can test error output easily.
     _pretty_patch_error_html = "Failed to run PrettyPatch, see error log."
 
     def pretty_patch_text(self, diff_path):
         if self._pretty_patch_available is None:
             self._pretty_patch_available = self.check_pretty_patch(more_logging=False)
         if not self._pretty_patch_available:
             return self._pretty_patch_error_html
         command = ("ruby", "-I", self._filesystem.dirname(self._pretty_patch_path),
                    self._pretty_patch_path, diff_path)
         try:
             # Diffs are treated as binary (we pass decode_output=False) as they
             # may contain multiple files of conflicting encodings.
             return self._executive.run_command(command, decode_output=False)
-        except OSError as e:
+        except OSError as error:
             # If the system is missing ruby log the error and stop trying.
             self._pretty_patch_available = False
-            _log.error("Failed to run PrettyPatch (%s): %s", command, e)
+            _log.error("Failed to run PrettyPatch (%s): %s", command, error)
             return self._pretty_patch_error_html
-        except ScriptError as e:
+        except ScriptError as error:
             # If ruby failed to run for some reason, log the command
             # output and stop trying.
             self._pretty_patch_available = False
-            _log.error("Failed to run PrettyPatch (%s):\n%s", command, e.message_with_output())
+            _log.error("Failed to run PrettyPatch (%s):\n%s", command, error.message_with_output())
             return self._pretty_patch_error_html
 
     def default_configuration(self):
         return 'Release'
 
     def clobber_old_port_specific_results(self):
         pass
 
     # FIXME: This does not belong on the port object.
     @memoized
@@ skipping 139 matching lines @@
             PhysicalTestSuite('fast/text', ["--enable-direct-write", "--enable-font-antialiasing"]),
         ]
 
     def virtual_test_suites(self):
         if self._virtual_test_suites is None:
             path_to_virtual_test_suites = self._filesystem.join(self.layout_tests_dir(), 'VirtualTestSuites')
             assert self._filesystem.exists(path_to_virtual_test_suites), 'LayoutTests/VirtualTestSuites not found'
             try:
                 test_suite_json = json.loads(self._filesystem.read_text_file(path_to_virtual_test_suites))
                 self._virtual_test_suites = [VirtualTestSuite(**d) for d in test_suite_json]
-            except ValueError as e:
-                raise ValueError("LayoutTests/VirtualTestSuites is not a valid JSON file: %s" % str(e))
+            except ValueError as error:
+                raise ValueError("LayoutTests/VirtualTestSuites is not a valid JSON file: %s" % error)
         return self._virtual_test_suites
 
     def _all_virtual_tests(self, suites):
         tests = []
         for suite in suites:
             self._populate_virtual_suite(suite)
             tests.extend(suite.tests.keys())
         return tests
 
     def _virtual_tests_matching_paths(self, paths, suites):
@@ skipping 134 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)