| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013-2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import collections | 5 import collections |
| 6 | 6 |
| 7 from .recipe_util import ModuleInjectionSite, static_call, static_wraps | 7 from .util import ModuleInjectionSite, static_call, static_wraps |
| 8 | 8 |
| 9 def combineify(name, dest, a, b): | 9 def combineify(name, dest, a, b): |
| 10 """ | 10 """ |
| 11 Combines dictionary members in two objects into a third one using addition. | 11 Combines dictionary members in two objects into a third one using addition. |
| 12 | 12 |
| 13 Args: | 13 Args: |
| 14 name - the name of the member | 14 name - the name of the member |
| 15 dest - the destination object | 15 dest - the destination object |
| 16 a - the first source object | 16 a - the first source object |
| 17 b - the second source object | 17 b - the second source object |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 453 def override_step_data(self, name, *data, **kwargs): | 453 def override_step_data(self, name, *data, **kwargs): |
| 454 """See _step_data()""" | 454 """See _step_data()""" |
| 455 kwargs['override'] = True | 455 kwargs['override'] = True |
| 456 return self._step_data(name, *data, **kwargs) | 456 return self._step_data(name, *data, **kwargs) |
| 457 override_step_data.__doc__ = _step_data.__doc__ | 457 override_step_data.__doc__ = _step_data.__doc__ |
| 458 | 458 |
| 459 def expect_exception(self, exc_type): #pylint: disable=R0201 | 459 def expect_exception(self, exc_type): #pylint: disable=R0201 |
| 460 ret = TestData(None) | 460 ret = TestData(None) |
| 461 ret.expect_exception(exc_type) | 461 ret.expect_exception(exc_type) |
| 462 return ret | 462 return ret |
| OLD | NEW |