Refactoring: variable names.

Author: jimf5

tests/test_otel.py

@@ -107,10 +107,10 @@ def span_attr(span, attr, atype):
         return getattr(value, atype)
 
 
-def collect_headers(headers, conf):
-    if conf not in _headers:
-        _headers[conf] = []
-    _headers[conf].append(headers)
+def collect_headers(headers, http_ver, otel_mode):
+    if f"{http_ver}{otel_mode}" not in _headers:
+        _headers[f"{http_ver}{otel_mode}"] = []
+    _headers[f"{http_ver}{otel_mode}"].append(headers)
 
 
 def simple_client(url, logger):
@@ -122,20 +122,20 @@ def do_get(sock, path):
         logger.debug(f"{http_recv=}")
         return http_recv.decode("utf-8")
 
-    parsed = urlparse(url)
-    port = 8443 if parsed.scheme == "https" else 8080
-    port = parsed.port if parsed.port is not None else port
-    with socket.create_connection((parsed.hostname, port)) as sock:
-        if parsed.scheme == "https":
+    p_url = urlparse(url)
+    port = 8443 if p_url.scheme == "https" else 8080
+    port = p_url.port if p_url.port is not None else port
+    with socket.create_connection((p_url.hostname, port)) as sock:
+        if p_url.scheme == "https":
             ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
             ctx.check_hostname = False
             ctx.verify_mode = ssl.CERT_NONE
             with ctx.wrap_socket(
-                sock, server_hostname=parsed.hostname
+                sock, server_hostname=p_url.hostname
             ) as ssock:
-                recv = do_get(ssock, parsed.path)
+                recv = do_get(ssock, p_url.path)
         else:
-            recv = do_get(sock, parsed.path)
+            recv = do_get(sock, p_url.path)
     return recv
 
 
@@ -211,12 +211,12 @@ def response(logger, http_ver, otel_mode, url, headers):
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
     with niquests.Session(multiplexed=True) as s:
         if http_ver == 3:
-            parsed = urlparse(url)
-            assert parsed.scheme == "https", "Only https:// URLs are supported."
-            port = parsed.port if parsed.port is not None else 8443
-            s.quic_cache_layer.add_domain(parsed.hostname, port)
+            p_url = urlparse(url)
+            assert p_url.scheme == "https", "Only https:// URLs are supported."
+            port = p_url.port if p_url.port is not None else 8443
+            s.quic_cache_layer.add_domain(p_url.hostname, port)
         resp = s.get(url, headers=headers, verify=False)
-    collect_headers(resp.headers, f"{http_ver}{otel_mode}")
+    collect_headers(resp.headers, http_ver, otel_mode)
     return resp.text