From 52d88ac369fed379acd3bafd655f3d2e67916bfb Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 2 Oct 2025 11:33:34 -0500 Subject: [PATCH] No need to change order of imports (bad conflict resolution) --- tests/logging/test_opentracing.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/logging/test_opentracing.py b/tests/logging/test_opentracing.py index daf5bbc454..3d39b5eaf0 100644 --- a/tests/logging/test_opentracing.py +++ b/tests/logging/test_opentracing.py @@ -42,6 +42,11 @@ from synapse.util.clock import Clock from tests.server import get_clock +try: + import jaeger_client +except ImportError: + jaeger_client = None # type: ignore + try: import opentracing @@ -50,11 +55,6 @@ except ImportError: opentracing = None # type: ignore LogContextScopeManager = None # type: ignore -try: - import jaeger_client -except ImportError: - jaeger_client = None # type: ignore - import logging