Make new code work in Python 3

gaqzi · Nov 25, 2015 · a134b08 · a134b08
1 parent 986c66d
commit a134b08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/gocd/api/response.py b/gocd/api/response.py
@@ -94,7 +94,12 @@ def payload(self):
         """
         if self.is_json:
             if not self._body_parsed:
-                self._body_parsed = json.loads(self._body.decode('utf-8'))
+                if hasattr(self._body, 'decode'):
+                    body = self._body.decode('utf-8')
+                else:
+                    body = self._body
+
+                self._body_parsed = json.loads(body)
 
             return self._body_parsed
         else:

diff --git a/tests/api/test_pipeline.py b/tests/api/test_pipeline.py
@@ -212,7 +212,7 @@ def test_console_output_single_stage(pipeline):
     instance = pipeline.instance()
     metadata, output = next(pipeline.console_output(instance))
 
-    assert r'[go] Job completed' in output
+    assert r'[go] Job completed' in output.decode('utf8')
     assert {'pipeline': 'Simple',
             'pipeline_counter': instance['counter'],
             'stage': 'defaultStage',
@@ -231,6 +231,7 @@ def test_console_output_multiple_stages(pipeline_multiple_stages):
     valid_args = ['Good Bye', 'Hello', 'ehlo test.somewhere.tld']
     valid = 0
     for metadata, output in pipeline.console_output():
+        output = output.decode('utf8')
         assert r'[go] Job completed' in output
         assert True in (
             '<arg>{0}</arg>'.format(job) in output for job in valid_args