| OLD | NEW |
| 1 # Copyright (c) 2011 Google Inc. All rights reserved. | 1 # Copyright (c) 2011 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 |
| 11 # in the documentation and/or other materials provided with the | 11 # in the documentation and/or other materials provided with the |
| 12 # distribution. | 12 # distribution. |
| 13 # * Neither the name of Google Inc. nor the names of its | 13 # * Neither the name of Google Inc. nor the names of its |
| 14 # contributors may be used to endorse or promote products derived from | 14 # contributors may be used to endorse or promote products derived from |
| 15 # this software without specific prior written permission. | 15 # this software without specific prior written permission. |
| 16 # | 16 # |
| 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 |
| 28 from StringIO import StringIO | 29 from StringIO import StringIO |
| 29 | 30 |
| 30 from webkitpy.common.system.environment import Environment | 31 from webkitpy.common.system.environment import Environment |
| 31 from webkitpy.common.system.executive_mock import MockExecutive | 32 from webkitpy.common.system.executive_mock import MockExecutive |
| 32 from webkitpy.common.system.filesystem_mock import MockFileSystem | 33 from webkitpy.common.system.filesystem_mock import MockFileSystem |
| 33 from webkitpy.common.system.platforminfo_mock import MockPlatformInfo | 34 from webkitpy.common.system.platforminfo_mock import MockPlatformInfo |
| 34 from webkitpy.common.system.user_mock import MockUser | 35 from webkitpy.common.system.user_mock import MockUser |
| 35 from webkitpy.common.system.workspace_mock import MockWorkspace | 36 from webkitpy.common.system.workspace_mock import MockWorkspace |
| 36 | 37 |
| 37 | 38 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 57 return Environment({"MOCK_ENVIRON_COPY": '1'}) | 58 return Environment({"MOCK_ENVIRON_COPY": '1'}) |
| 58 | 59 |
| 59 def print_(self, *args, **kwargs): | 60 def print_(self, *args, **kwargs): |
| 60 sep = kwargs.get('sep', ' ') | 61 sep = kwargs.get('sep', ' ') |
| 61 end = kwargs.get('end', '\n') | 62 end = kwargs.get('end', '\n') |
| 62 file = kwargs.get('file', None) | 63 file = kwargs.get('file', None) |
| 63 stderr = kwargs.get('stderr', False) | 64 stderr = kwargs.get('stderr', False) |
| 64 | 65 |
| 65 file = file or (self.stderr if stderr else self.stdout) | 66 file = file or (self.stderr if stderr else self.stdout) |
| 66 file.write(sep.join([str(arg) for arg in args]) + end) | 67 file.write(sep.join([str(arg) for arg in args]) + end) |
| OLD | NEW |