Merge pull request #48 from adobe-apiplatform/v2

prepare for v2.5.1 release

Author: adobeDan

HISTORY.md

@@ -85,3 +85,10 @@ Bug fix release:
 
 * [Issue 44](https://github.com/adobe-apiplatform/umapi-client.py/issues/44)
     * Default behavior of UsersQuery is now correct: only return direct memberships in the info about queried users.
+
+### Version 2.5.1
+
+Bug fix release:
+
+* [Issue 47](https://github.com/adobe-apiplatform/umapi-client.py/issues/47)
+    * When an immediate retry was done due to a timeout, there was a logging error.

umapi_client/connection.py

@@ -423,7 +423,7 @@ def call():
                     sleep(retry_wait)
                     total_time += retry_wait
                 else:
-                    if self.logger: self.logger.warning("Immediate retry...", retry_wait)
+                    if self.logger: self.logger.warning("Immediate retry...")
         if self.logger: self.logger.error("UMAPI timeout...giving up after %d attempts (%d seconds).",
                                           self.retry_max_attempts, total_time)
         raise UnavailableError(self.retry_max_attempts, total_time, result)

umapi_client/version.py

@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = "2.5"
+__version__ = "2.5.1"