Revision 1b429e2a lib/utils.py

b/lib/utils.py
1579 1579 
  """
1580 1580 
  if timeout is not None:
1581 1581 
    retrywaiter = FdConditionWaiterHelper(timeout)
1582 
    result = Retry(retrywaiter.Poll, RETRY_REMAINING_TIME, timeout,
1583 
                   args=(fdobj, event), wait_fn=retrywaiter.UpdateTimeout)
1582 
    try:
1583 
      result = Retry(retrywaiter.Poll, RETRY_REMAINING_TIME, timeout,
1584 
                     args=(fdobj, event), wait_fn=retrywaiter.UpdateTimeout)
1585 
    except RetryTimeout:
1586 
      result = None
1584 1587 
  else:
1585 1588 
    result = None
1586 1589 
    while result is None:
......
2606 2609 
      return fn(*args)
2607 2610 
    except RetryAgain:
2608 2611 
      pass
2612 
    except RetryTimeout:
2613 
      raise errors.ProgrammerError("Nested retry loop detected that didn't"
2614 
                                   " handle RetryTimeout")
2609 2615 

  		





  2610
  2616
  
    
    remaining_time = end_time - _time_fn()


  		





  2611
  2617
  
    

  		












Also available in:
  Unified diff