Fixed ruff

Author: rads-1996

opentelemetry-api/src/opentelemetry/attributes/__init__.py

@@ -17,11 +17,13 @@
 from collections import OrderedDict
 from collections.abc import MutableMapping
 from typing import Mapping, Optional, Sequence, Tuple, Union
+
 from opentelemetry.util import types
 
 # Optional Django imports - only available if Django is installed
 try:
     from django.core.handlers.wsgi import WSGIRequest
+
     _HAS_DJANGO = True
 except ImportError:
     WSGIRequest = None  # type: ignore
@@ -134,14 +136,20 @@ def _clean_extended_attribute_value(
         if max_len is not None and isinstance(value, str):
             value = value[:max_len]
         return value
-   
-    if _HAS_DJANGO and WSGIRequest is not None and isinstance(value, WSGIRequest):
+
+    if (
+        _HAS_DJANGO
+        and WSGIRequest is not None
+        and isinstance(value, WSGIRequest)
+    ):
         wsgi_data = {
             "method": getattr(value, "method", None),
             "path": getattr(value, "path", None),
             "path_info": getattr(value, "path_info", None),
             "content_type": getattr(value, "content_type", None),
-            "user": str(getattr(value, "user", None)) if hasattr(value, "user") else None,
+            "user": str(getattr(value, "user", None))
+            if hasattr(value, "user")
+            else None,
         }
         return {k: v for k, v in wsgi_data.items() if v is not None}
 

opentelemetry-api/tests/attributes/test_attributes.py

@@ -13,10 +13,21 @@
 # limitations under the License.
 
 # type: ignore
-
+import io
 import unittest
 from typing import MutableSequence
 
+# Optional Django imports for testing
+try:
+    from django.conf import settings
+    from django.core.handlers.wsgi import WSGIRequest
+
+    _HAS_DJANGO = True
+except ImportError:
+    WSGIRequest = None  # type: ignore
+    settings = None  # type: ignore
+    _HAS_DJANGO = False
+
 from opentelemetry.attributes import (
     BoundedAttributes,
     _clean_attribute,
@@ -181,71 +192,70 @@ def test_mapping(self):
         self.assertEqual(
             _clean_extended_attribute("headers", mapping, None), expected
         )
-    
+
     def test_wsgi_request_attribute(self):
         # Test WSGIRequest type validation
         try:
-            from django.core.handlers.wsgi import WSGIRequest
-            from django.conf import settings
-            import io
-            
             # Configure Django settings if not already configured
             if not settings.configured:
                 settings.configure(
                     DEBUG=True,
-                    SECRET_KEY='test-secret-key',
+                    SECRET_KEY="test-secret-key",
                     USE_TZ=True,
                     ROOT_URLCONF=[],
                     MIDDLEWARE=[],
                 )
-            
+
             # Create a minimal WSGI environ dict
             environ = {
-                'REQUEST_METHOD': 'GET',
-                'PATH_INFO': '/test',
-                'QUERY_STRING': '',
-                'CONTENT_TYPE': '',
-                'CONTENT_LENGTH': '',
-                'HTTP_HOST': 'testserver',
-                'wsgi.version': (1, 0),
-                'wsgi.url_scheme': 'http',
-                'wsgi.input': io.StringIO(),
-                'wsgi.errors': io.StringIO(),
-                'wsgi.multithread': False,
-                'wsgi.multiprocess': False,
-                'wsgi.run_once': False,
-                'SERVER_NAME': 'testserver',
-                'SERVER_PORT': '80',
+                "REQUEST_METHOD": "GET",
+                "PATH_INFO": "/test",
+                "QUERY_STRING": "",
+                "CONTENT_TYPE": "",
+                "CONTENT_LENGTH": "",
+                "HTTP_HOST": "testserver",
+                "wsgi.version": (1, 0),
+                "wsgi.url_scheme": "http",
+                "wsgi.input": io.StringIO(),
+                "wsgi.errors": io.StringIO(),
+                "wsgi.multithread": False,
+                "wsgi.multiprocess": False,
+                "wsgi.run_once": False,
+                "SERVER_NAME": "testserver",
+                "SERVER_PORT": "80",
             }
-            
+
             # Create a WSGIRequest object
             wsgi_request = WSGIRequest(environ)
-            
+
             # Test that WSGIRequest gets cleaned to a dictionary format
             expected_cleaned = {
-                'method': 'GET',
-                'path': '/test',
-                'path_info': '/test',
-                'content_type': ''
+                "method": "GET",
+                "path": "/test",
+                "path_info": "/test",
+                "content_type": "",
             }
-            
-            # Test WSGIRequest cleaning directly
-            from opentelemetry.attributes import _clean_extended_attribute
-            cleaned_value = _clean_extended_attribute("request", wsgi_request, None)
+
+            cleaned_value = _clean_extended_attribute(
+                "request", wsgi_request, None
+            )
             self.assertEqual(cleaned_value, expected_cleaned)
-            
-            # Test WSGIRequest in sequences - should be cleaned to dict
-            cleaned_sequence = _clean_extended_attribute("requests", [wsgi_request], None)
+
+            cleaned_sequence = _clean_extended_attribute(
+                "requests", [wsgi_request], None
+            )
             self.assertEqual(cleaned_sequence, (expected_cleaned,))
-            
-            # Test WSGIRequest in mappings - should be cleaned to dict
-            cleaned_mapping = _clean_extended_attribute("data", {"request": wsgi_request}, None)
+
+            cleaned_mapping = _clean_extended_attribute(
+                "data", {"request": wsgi_request}, None
+            )
             self.assertEqual(cleaned_mapping, {"request": expected_cleaned})
-            
+
         except ImportError:
             # Skip test if django is not available
             self.skipTest("Django not available")
 
+
 class TestBoundedAttributes(unittest.TestCase):
     # pylint: disable=consider-using-dict-items
     base = {