diff options
| author | Clint Byrum <clint@fewbar.com> | 2017-05-10 20:53:12 -0700 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2017-05-19 06:45:31 -0700 |
| commit | f322fe2eeefb827a24d2082961655ad2c0ed1a53 (patch) | |
| tree | 82d11e553d254e368a7142733bad3131f832a9e9 /zuul/merger | |
| parent | 1d0c7d1941676b0739149b418691383ebae44fed (diff) | |
| download | zuul-f322fe2eeefb827a24d2082961655ad2c0ed1a53.tar.gz | |
Encoding changes in tests for py3
In many cases we do need to be explicit about bytes vs. strings for
python 3 compatibility.
Change-Id: I9cbc5c73004d03f711f8a6e5752a0865ae55fb9f
Diffstat (limited to 'zuul/merger')
| -rw-r--r-- | zuul/merger/merger.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py index 4555a10d0..714d64335 100644 --- a/zuul/merger/merger.py +++ b/zuul/merger/merger.py @@ -199,7 +199,7 @@ class Repo(object): tree = repo.commit(commit).tree for fn in files: if fn in tree: - ret[fn] = tree[fn].data_stream.read() + ret[fn] = tree[fn].data_stream.read().decode('utf8') else: ret[fn] = None return ret |