Skip to content

Commit 1a2729f

Browse files
authored
Merge pull request #233 from dagansandler/fix_python311_stacklevel_logging
Fixing Record pathnames are incorrect on python3.11
2 parents f1ce5f7 + 9a02f94 commit 1a2729f

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

reportportal_client/logs/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ def _log(self, level, msg, args, exc_info=None, extra=None,
5858
# exception on some versions of IronPython. We trap it here so that
5959
# IronPython can use logging.
6060
try:
61+
if sys.version_info >= (3, 11):
62+
kwargs.setdefault('stacklevel', 2)
6163
if 'stacklevel' in kwargs:
6264
fn, lno, func, sinfo = \
6365
self.findCaller(stack_info, kwargs['stacklevel'])

tests/logs/test_rp_logger.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def test_record_make(logger_handler):
4040
logger.info('test_log')
4141
record = verify_record(logger_handler)
4242
assert not getattr(record, 'attachment')
43+
assert record.pathname == __file__
4344

4445

4546
@mock.patch('reportportal_client.logs.logging.Logger.handle')
@@ -86,3 +87,4 @@ def test_stacklevel_record_make(logger_handler):
8687
stack_info=inspect.stack(), stacklevel=2)
8788
record = verify_record(logger_handler)
8889
assert record.stack_info.endswith("logger.error('test_log', exc_info=RuntimeError('test'),")
90+
assert record.pathname == __file__

0 commit comments

Comments
 (0)