Skip to content

Commit 6c62197

Browse files
committed
Improve compatibility with patched python-json-logger on py3.12+
Discard the `taskName` field from event capsule, to preserve compatibility both with current python-json-logger versions, and with versions containing the Python 3.12 fix from madzak/python-json-logger#188 that removes the reserved `taskName` field.
1 parent 5b3cdf2 commit 6c62197

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

tests/test_logger.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,7 @@ def test_emit():
166166
"__metadata_version__": 1,
167167
"something": "blah",
168168
}
169-
if sys.version_info >= (3, 12):
170-
expected["taskName"] = None
169+
event_capsule.pop("taskName", None)
171170
assert event_capsule == expected
172171

173172

@@ -214,8 +213,7 @@ def test_message_field():
214213
"something": "blah",
215214
"message": "a message was seen",
216215
}
217-
if sys.version_info >= (3, 12):
218-
expected["taskName"] = None
216+
event_capsule.pop("taskName", None)
219217
assert event_capsule == expected
220218

221219

@@ -263,8 +261,7 @@ def test_nested_message_field():
263261
"__metadata_version__": 1,
264262
"thing": {"message": "a nested message was seen"},
265263
}
266-
if sys.version_info >= (3, 12):
267-
expected["taskName"] = None
264+
event_capsule.pop("taskName", None)
268265
assert event_capsule == expected
269266

270267

@@ -428,8 +425,7 @@ def test_unique_logger_instances():
428425
"__metadata_version__": 1,
429426
"something": "blah",
430427
}
431-
if sys.version_info >= (3, 12):
432-
expected["taskName"] = None
428+
event_capsule0.pop("taskName", None)
433429
assert event_capsule0 == expected
434430

435431
event_capsule1 = json.loads(output1.getvalue())
@@ -443,8 +439,7 @@ def test_unique_logger_instances():
443439
"__metadata_version__": 1,
444440
"something": "blah",
445441
}
446-
if sys.version_info >= (3, 12):
447-
expected["taskName"] = None
442+
event_capsule1.pop("taskName", None)
448443
assert event_capsule1 == expected
449444

450445

0 commit comments

Comments
 (0)