From a42e63a4a9f053ee73d1917638f601521c9ad5a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Wed, 5 Sep 2018 18:18:37 +0200 Subject: [PATCH] Fix Python 3 compatiblity in K8sClient.watch() This commit fixes classic unicode-bytes incompatibility in K8sClient.watch(). Implements: blueprint goal-python36 Change-Id: I890e0e3541b00bc3ee834feba759ce0d073e94d7 Closes-Bug: 1790902 --- kuryr_kubernetes/k8s_client.py | 4 ++-- kuryr_kubernetes/tests/unit/test_k8s_client.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kuryr_kubernetes/k8s_client.py b/kuryr_kubernetes/k8s_client.py index de555624f..60295b98b 100644 --- a/kuryr_kubernetes/k8s_client.py +++ b/kuryr_kubernetes/k8s_client.py @@ -197,7 +197,7 @@ class K8sClient(object): headers=header)) as response: if not response.ok: raise exc.K8sClientException(response.text) - for line in response.iter_lines(delimiter='\n'): - line = line.strip() + for line in response.iter_lines(): + line = line.decode('utf-8').strip() if line: yield jsonutils.loads(line) diff --git a/kuryr_kubernetes/tests/unit/test_k8s_client.py b/kuryr_kubernetes/tests/unit/test_k8s_client.py index acd8cd1c2..b98f5f022 100644 --- a/kuryr_kubernetes/tests/unit/test_k8s_client.py +++ b/kuryr_kubernetes/tests/unit/test_k8s_client.py @@ -311,7 +311,7 @@ class TestK8sClient(test_base.TestCase): def test_watch(self, m_get): path = '/test' data = [{'obj': 'obj%s' % i} for i in range(3)] - lines = [jsonutils.dumps(i) for i in data] + lines = [jsonutils.dump_as_bytes(i) for i in data] m_resp = mock.MagicMock() m_resp.ok = True