Merge webkit_patch and multi_command_tool.

third_party/WebKit/Tools/Scripts/webkit-patch

 #!/usr/bin/env python
 # Copyright (c) 2011 Code Aurora Forum. All rights reserved.
 # Copyright (c) 2010 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org)
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
@@ skipping 15 matching lines @@
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # A tool for automating dealing with bugzilla, posting patches, committing patches, etc.
 
 import logging
-import os
 import signal
 import sys
 import codecs
 
-import webkitpy.common.version_check

[Dirk Pranke, 2016/07/01 22:55:42]

This line needs to stay in. Look at the module to see what it's doing.

[qyearsley, 2016/07/02 17:26:29]

Done

-
 from webkitpy.common.system.logutils import configure_logging
 from webkitpy.tool.webkit_patch import WebKitPatch
 
 # A StreamWriter will by default try to encode all objects passed
 # to write(), so when passed a raw string already encoded as utf8,
 # it will blow up with an UnicodeDecodeError. This does not match
 # the default behaviour of writing to sys.stdout, so we intercept
 # the case of writing raw strings and make sure StreamWriter gets
 # input that it can handle.
 
 
 class ForgivingUTF8Writer(codecs.lookup('utf-8')[-1]):
 
-    def write(self, object):
-        if isinstance(object, str):
+    def write(self, obj):
+        if isinstance(obj, str):
             # Assume raw strings are utf-8 encoded. If this line
             # fails with an UnicodeDecodeError, our assumption was
             # wrong, and the stacktrace should show you where we
             # write non-Unicode/UTF-8 data (which we shouldn't).
-            object = object.decode('utf-8')
-        return codecs.StreamWriter.write(self, object)
+            obj = obj.decode('utf-8')
+        return codecs.StreamWriter.write(self, obj)
 
 # By default, sys.stdout assumes ascii encoding.  Since our messages can
 # contain unicode strings (as with some peoples' names) we need to apply
 # the utf-8 codec to prevent throwing and exception.
 # Not having this was the cause of https://bugs.webkit.org/show_bug.cgi?id=63452.
 sys.stdout = ForgivingUTF8Writer(sys.stdout)
 
 _log = logging.getLogger("webkit-patch")
 
 
 def main():
     # This is a hack to let us enable DEBUG logging as early as possible.
     # Note this can't be ternary as versioning.check_version()
     # hasn't run yet and this python might be older than 2.5.
     if set(["-v", "--verbose"]).intersection(set(sys.argv)):
         logging_level = logging.DEBUG
     else:
         logging_level = logging.INFO
     configure_logging(logging_level=logging_level)
-    WebKitPatch(os.path.abspath(__file__)).main()
+    WebKitPatch().main()
 
 
 if __name__ == "__main__":
     try:
         main()
     except KeyboardInterrupt:
         sys.exit(signal.SIGINT + 128)