Merge "Pop instead of get for timeout kwarg"

This commit is contained in:
Jenkins 2014-04-07 00:36:54 +00:00 committed by Gerrit Code Review
commit 11369595c0

View File

@ -271,7 +271,7 @@ def get_id_from_href(href):
def execute_with_timeout(*args, **kwargs):
time = kwargs.get('timeout', 30)
time = kwargs.pop('timeout', 30)
def cb_timeout():
msg = (_("Time out after waiting"