From 0db63883c08032f5f8ff3f45c7255eadc54d6a1f Mon Sep 17 00:00:00 2001 From: Mihnea Saracin Date: Tue, 15 Jun 2021 18:13:35 +0300 Subject: [PATCH] Python 3: Enable sm-api to work after unlock The "min()" function works for None arguments in Python 2 but in Python 3 raises an error. We add a check to ensure that the function is not called with the None argument in Python 3. Story: 2006796 Task: 42388 Depends-On: I29a81755f732b55f67321748604b2e5d951935c9 Change-Id: I2199e0b87d342cec305edbb10483c6c038ad591c Signed-off-by: Mihnea Saracin (cherry picked from commit f2186d04c0bed873a9f601c952c8b91442ca68c4) --- service-mgmt-api/sm-api/sm_api/api/controllers/v1/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/service-mgmt-api/sm-api/sm_api/api/controllers/v1/utils.py b/service-mgmt-api/sm-api/sm_api/api/controllers/v1/utils.py index 4506a3e0..8d4a9aaf 100644 --- a/service-mgmt-api/sm-api/sm_api/api/controllers/v1/utils.py +++ b/service-mgmt-api/sm-api/sm_api/api/controllers/v1/utils.py @@ -35,7 +35,9 @@ JSONPATCH_EXCEPTIONS = (jsonpatch.JsonPatchException, def validate_limit(limit): - if limit and limit < 0: + if limit is None: + return CONF.api_limit_max + elif limit < 0: raise wsme.exc.ClientSideError(_("Limit must be positive")) return min(CONF.api_limit_max, limit) or CONF.api_limit_max