From c3fa464fa88721a98111469f1c3a72fcc11a325d Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Wed, 14 Nov 2018 21:52:13 +0100
Subject: [PATCH] convert redis returned binaries to strings
---
inventory_provider/data_routes.py | 2 +-
test/test_data_routes.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/inventory_provider/data_routes.py b/inventory_provider/data_routes.py
index 25518cdc..b515bf44 100644
--- a/inventory_provider/data_routes.py
+++ b/inventory_provider/data_routes.py
@@ -48,5 +48,5 @@ def routers():
host=redis_config["hostname"],
port=redis_config["port"])
return Response(
- json.dumps(list(r.keys("*"))),
+ json.dumps(list([k.decode("utf-8") for k in r.keys("*")])),
mimetype="application/json")
diff --git a/test/test_data_routes.py b/test/test_data_routes.py
index c034ec9f..42878e10 100644
--- a/test/test_data_routes.py
+++ b/test/test_data_routes.py
@@ -184,7 +184,7 @@ class MockedRedis(object):
MockedRedis.db[key] = value
def keys(self, *args, **kwargs):
- return MockedRedis.db.keys()
+ return list([k.encode("utf-8") for k in MockedRedis.db.keys()])
def test_routers_list(mocker, client):
--
GitLab