diff options
| author | Dana Powers <dana.powers@rd.io> | 2014-09-07 18:52:05 -0700 |
|---|---|---|
| committer | Dana Powers <dana.powers@rd.io> | 2014-09-07 19:09:32 -0700 |
| commit | 715425c639a476139065689afde3d255a07d6f96 (patch) | |
| tree | 0ef2cd875c97c8ca867d89328d6fd5fec7dfcbe8 /test/service.py | |
| parent | a99384f4c601d127ab1c4fe5b272ea5c07fd695d (diff) | |
| parent | be23042ecd9ab330886745ccc9ec9e3a0039836f (diff) | |
| download | kafka-python-715425c639a476139065689afde3d255a07d6f96.tar.gz | |
Merge pull request #227 from wizzat-feature/py3
Python 3 Support
Conflicts:
kafka/producer.py
test/test_client.py
test/test_client_integration.py
test/test_codec.py
test/test_consumer.py
test/test_consumer_integration.py
test/test_failover_integration.py
test/test_producer.py
test/test_producer_integration.py
test/test_protocol.py
test/test_util.py
Diffstat (limited to 'test/service.py')
| -rw-r--r-- | test/service.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/service.py b/test/service.py index 2f66120..dcd3e68 100644 --- a/test/service.py +++ b/test/service.py @@ -54,11 +54,11 @@ class SpawnedService(threading.Thread): if self.child.stdout in rds: line = self.child.stdout.readline() - self.captured_stdout.append(line) + self.captured_stdout.append(line.decode('utf-8')) if self.child.stderr in rds: line = self.child.stderr.readline() - self.captured_stderr.append(line) + self.captured_stderr.append(line.decode('utf-8')) if self.should_die.is_set(): self.child.terminate() |