Compare commits

...

3 Commits

Author SHA1 Message Date
Eric Eastwood
5f59fefa3b Fix lints 2025-09-29 14:06:00 -05:00
Eric Eastwood
ee3f9a9adc Add changelog 2025-09-29 13:48:33 -05:00
Eric Eastwood
47af34d73b Remove deprecated LoggingContext methods
These were added for backwards compatibility in https://github.com/matrix-org/synapse/pull/7408
2025-09-29 13:41:28 -05:00
2 changed files with 1 additions and 42 deletions

View File

@@ -0,0 +1 @@
Remove deprecated `LoggingContext.set_current_context`/`LoggingContext.current_context` methods which already have equivalent bare methods in `synapse.logging.context`.

View File

@@ -33,7 +33,6 @@ See doc/log_contexts.rst for details on how this works.
import logging import logging
import threading import threading
import typing import typing
import warnings
from types import TracebackType from types import TracebackType
from typing import ( from typing import (
TYPE_CHECKING, TYPE_CHECKING,
@@ -347,47 +346,6 @@ class LoggingContext:
def __str__(self) -> str: def __str__(self) -> str:
return self.name return self.name
@classmethod
def current_context(cls) -> LoggingContextOrSentinel:
"""Get the current logging context from thread local storage
This exists for backwards compatibility. ``current_context()`` should be
called directly.
Returns:
The current logging context
"""
warnings.warn(
"synapse.logging.context.LoggingContext.current_context() is deprecated "
"in favor of synapse.logging.context.current_context().",
DeprecationWarning,
stacklevel=2,
)
return current_context()
@classmethod
def set_current_context(
cls, context: LoggingContextOrSentinel
) -> LoggingContextOrSentinel:
"""Set the current logging context in thread local storage
This exists for backwards compatibility. ``set_current_context()`` should be
called directly.
Args:
context: The context to activate.
Returns:
The context that was previously active
"""
warnings.warn(
"synapse.logging.context.LoggingContext.set_current_context() is deprecated "
"in favor of synapse.logging.context.set_current_context().",
DeprecationWarning,
stacklevel=2,
)
return set_current_context(context)
def __enter__(self) -> "LoggingContext": def __enter__(self) -> "LoggingContext":
"""Enters this logging context into thread local storage""" """Enters this logging context into thread local storage"""
old_context = set_current_context(self) old_context = set_current_context(self)