[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/24] iotests: drop pre-Python 3.4 compatibility code
From: |
Max Reitz |
Subject: |
[PULL 07/24] iotests: drop pre-Python 3.4 compatibility code |
Date: |
Tue, 5 May 2020 14:58:09 +0200 |
From: John Snow <address@hidden>
We no longer need to accommodate <3.4, drop this code.
(The lines were > 79 chars and it stood out.)
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/iotests.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index dae124872e..374a8f6077 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -360,12 +360,9 @@ def log(msg, filters=(), indent=None):
for flt in filters:
msg = flt(msg)
if isinstance(msg, (dict, list)):
- # Python < 3.4 needs to know not to add whitespace when
pretty-printing:
- separators = (', ', ': ') if indent is None else (',', ': ')
# Don't sort if it's already sorted
do_sort = not isinstance(msg, OrderedDict)
- print(json.dumps(msg, sort_keys=do_sort,
- indent=indent, separators=separators))
+ print(json.dumps(msg, sort_keys=do_sort, indent=indent))
else:
print(msg)
--
2.26.2
- [PULL 00/24] Block patches, Max Reitz, 2020/05/05
- [PULL 03/24] iotests: ignore import warnings from pylint, Max Reitz, 2020/05/05
- [PULL 02/24] iotests: don't use 'format' for drive_add, Max Reitz, 2020/05/05
- [PULL 04/24] iotests: replace mutable list default args, Max Reitz, 2020/05/05
- [PULL 06/24] iotests: alphabetize standard imports, Max Reitz, 2020/05/05
- [PULL 05/24] iotests: add pylintrc file, Max Reitz, 2020/05/05
- [PULL 07/24] iotests: drop pre-Python 3.4 compatibility code,
Max Reitz <=
- [PULL 01/24] iotests: do a light delinting, Max Reitz, 2020/05/05
- [PULL 08/24] iotests: touch up log function signature, Max Reitz, 2020/05/05
- [PULL 10/24] iotests: add hmp helper with logging, Max Reitz, 2020/05/05
- [PULL 12/24] iotest 258: use script_main, Max Reitz, 2020/05/05
- [PULL 11/24] iotests: add script_initialize, Max Reitz, 2020/05/05
- [PULL 13/24] iotests: Mark verify functions as private, Max Reitz, 2020/05/05
- [PULL 09/24] iotests: limit line length to 79 chars, Max Reitz, 2020/05/05
- [PULL 18/24] block: Comment cleanups, Max Reitz, 2020/05/05
- [PULL 14/24] iotests: use python logging for iotests.log(), Max Reitz, 2020/05/05
- [PULL 19/24] Fix iotest 153, Max Reitz, 2020/05/05