summaryrefslogtreecommitdiff
path: root/dev-python/python-json-logger/files
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2025-02-27 12:02:50 +0100
committerMichał Górny <mgorny@gentoo.org>2025-02-27 14:06:12 +0100
commit33a80cdc4c9187752b35b11bc837ba89cc3407c1 (patch)
tree17300a4338201c6c88d71670a00754e9ea1aaf86 /dev-python/python-json-logger/files
parentc4ab365ed72a52b2aedc29af26c578863fbbc3ef (diff)
downloadgentoo-33a80cdc4c9187752b35b11bc837ba89cc3407c1.tar.gz
gentoo-33a80cdc4c9187752b35b11bc837ba89cc3407c1.tar.bz2
gentoo-33a80cdc4c9187752b35b11bc837ba89cc3407c1.zip
dev-python/python-json-logger: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/python-json-logger/files')
-rw-r--r--dev-python/python-json-logger/files/python-json-logger-2.0.7-py312.patch38
-rw-r--r--dev-python/python-json-logger/files/python-json-logger-2.0.7-py313.patch25
2 files changed, 0 insertions, 63 deletions
diff --git a/dev-python/python-json-logger/files/python-json-logger-2.0.7-py312.patch b/dev-python/python-json-logger/files/python-json-logger-2.0.7-py312.patch
deleted file mode 100644
index 1cab3b851ff6..000000000000
--- a/dev-python/python-json-logger/files/python-json-logger-2.0.7-py312.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0ce621a8dd9dfa708a920c0ad90df8f7593b6110 Mon Sep 17 00:00:00 2001
-From: cache-miss <cache-miss>
-Date: Sat, 9 Mar 2024 18:27:24 +0800
-Subject: [PATCH] add taskName to reserved_attrs which was added in python 3.12
-
-Closes: https://github.com/madzak/python-json-logger/pull/188
----
- src/pythonjsonlogger/jsonlogger.py | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/pythonjsonlogger/jsonlogger.py b/src/pythonjsonlogger/jsonlogger.py
-index e250c7e..a911478 100644
---- a/src/pythonjsonlogger/jsonlogger.py
-+++ b/src/pythonjsonlogger/jsonlogger.py
-@@ -6,6 +6,7 @@ import logging
- import json
- import re
- from datetime import date, datetime, time, timezone
-+import sys
- import traceback
- import importlib
-
-@@ -23,6 +24,12 @@ RESERVED_ATTRS: Tuple[str, ...] = (
- 'msecs', 'message', 'msg', 'name', 'pathname', 'process',
- 'processName', 'relativeCreated', 'stack_info', 'thread', 'threadName')
-
-+if sys.version_info >= (3, 12):
-+ RESERVED_ATTRS = (
-+ *RESERVED_ATTRS,
-+ "taskName",
-+ )
-+
-
-
- def merge_record_extra(
---
-2.45.2
-
diff --git a/dev-python/python-json-logger/files/python-json-logger-2.0.7-py313.patch b/dev-python/python-json-logger/files/python-json-logger-2.0.7-py313.patch
deleted file mode 100644
index 8421617783da..000000000000
--- a/dev-python/python-json-logger/files/python-json-logger-2.0.7-py313.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/tests/test_jsonlogger.py b/tests/test_jsonlogger.py
-index af369d2..068e760 100644
---- a/tests/test_jsonlogger.py
-+++ b/tests/test_jsonlogger.py
-@@ -176,13 +176,17 @@ def test_json_default_encoder(self):
- "1900-01-01T00:00:00")
-
- @unittest.mock.patch('time.time', return_value=1500000000.0)
-- def test_json_default_encoder_with_timestamp(self, time_mock):
-+ @unittest.mock.patch('time.time_ns', return_value=1500000000000000000)
-+ def test_json_default_encoder_with_timestamp(self, time_ns_mock, time_mock):
- fr = jsonlogger.JsonFormatter(timestamp=True)
- self.log_handler.setFormatter(fr)
-
- self.log.info("Hello")
--
-- self.assertTrue(time_mock.called)
-+
-+ if sys.version_info < (3, 13):
-+ self.assertTrue(time_mock.called)
-+ else:
-+ self.assertTrue(time_ns_mock.called)
- log_json = json.loads(self.buffer.getvalue())
- self.assertEqual(log_json.get("timestamp"), "2017-07-14T02:40:00+00:00")
-