[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 06/11] iotests: drop Python 3.4 compatibility code
From: |
John Snow |
Subject: |
[PATCH v8 06/11] iotests: drop Python 3.4 compatibility code |
Date: |
Mon, 16 Mar 2020 20:41:00 -0400 |
We no longer need to accommodate 3.4, drop this code.
(Also, the line is over 79 characters, so drop it.)
Touch up the docstring a little bit while we're here.
Signed-off-by: John Snow <address@hidden>
---
tests/qemu-iotests/iotests.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 7cd74e7cb1..3d90fb157d 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -22,6 +22,7 @@
import unittest
import sys
import struct
+from typing import Optional
import json
import signal
import logging
@@ -350,18 +351,17 @@ def _filter(_key, value):
return value
return filter_qmp(qmsg, _filter)
-def log(msg, filters=(), indent=None):
- '''Logs either a string message or a JSON serializable message (like QMP).
- If indent is provided, JSON serializable messages are pretty-printed.'''
+def log(msg, filters=(), indent: Optional[int] = None) -> None:
+ """
+ Logs either a string message or a JSON serializable message (like QMP).
+ If indent is provided, JSON serializable messages are pretty-printed.
+ """
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.21.1
- [PATCH v8 00/11] iotests: use python logging, John Snow, 2020/03/16
- [PATCH v8 02/11] iotests: don't use 'format' for drive_add, John Snow, 2020/03/16
- [PATCH v8 03/11] iotests: ignore import warnings from pylint, John Snow, 2020/03/16
- [PATCH v8 04/11] iotests: replace mutable list default args, John Snow, 2020/03/16
- [PATCH v8 06/11] iotests: drop Python 3.4 compatibility code,
John Snow <=
- [PATCH v8 01/11] iotests: do a light delinting, John Snow, 2020/03/16
- [PATCH v8 05/11] iotests: add pylintrc file, John Snow, 2020/03/16
- [PATCH v8 07/11] iotests: limit line length to 79 chars, John Snow, 2020/03/16