diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-21 10:26:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-21 10:26:46 +0100 |
| commit | 5536c19d911aba652ac7454ef4ac65912b198c21 (patch) | |
| tree | 2556624d082e281a36df339c0839b56baafe5468 /scripts/analyze-migration.py | |
| parent | 053a4177817db307ec854356e95b5b350800a216 (diff) | |
| parent | 14f9cec7132bc60f9839048b0a0f8ef7ae9ed64c (diff) | |
| download | focaccia-qemu-5536c19d911aba652ac7454ef4ac65912b198c21.tar.gz focaccia-qemu-5536c19d911aba652ac7454ef4ac65912b198c21.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2020-09-18
Alexey Kirillov (1):
analyze-migration.py: fix read_migration_debug_json() return type
Andrey Shinkevich (1):
scripts/simplebench: compare write request performance
# gpg: Signature made Fri 18 Sep 2020 19:02:00 BST
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/python-next-pull-request:
analyze-migration.py: fix read_migration_debug_json() return type
scripts/simplebench: compare write request performance
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/analyze-migration.py')
| -rwxr-xr-x | scripts/analyze-migration.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py index 95838cbff3..d70ec7d33a 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -97,7 +97,8 @@ class MigrationFile(object): # Seek back to where we were at the beginning self.file.seek(entrypos, 0) - return data[jsonpos:jsonpos + jsonlen] + # explicit decode() needed for Python 3.5 compatibility + return data[jsonpos:jsonpos + jsonlen].decode("utf-8") def close(self): self.file.close() |