| OLD | NEW |
| 1 # Copyright (c) 2010 Google Inc. All rights reserved. | 1 # Copyright (c) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 'webkitruby', 'PrettyPatch') | 55 'webkitruby', 'PrettyPatch') |
| 56 prettify_path = os.path.join(pretty_patch_path, "prettify.rb") | 56 prettify_path = os.path.join(pretty_patch_path, "prettify.rb") |
| 57 args = [ | 57 args = [ |
| 58 "ruby", | 58 "ruby", |
| 59 "-I", | 59 "-I", |
| 60 pretty_patch_path, | 60 pretty_patch_path, |
| 61 prettify_path, | 61 prettify_path, |
| 62 ] | 62 ] |
| 63 # PrettyPatch does not modify the encoding of the diff output | 63 # PrettyPatch does not modify the encoding of the diff output |
| 64 # so we can't expect it to be utf-8. | 64 # so we can't expect it to be utf-8. |
| 65 return self._executive.run_command(args, input_func=diff, decode_output=
False) | 65 return self._executive.run_command(args, input=diff, decode_output=False
) |
| OLD | NEW |