Fix helpers tests

aiohttp/helpers.py

@@ -15,7 +15,7 @@
 from pathlib import Path
 from urllib.parse import quote, urlencode, urlsplit
 
-from multidict import istr, MultiDict, MultiDictProxy
+from multidict import MultiDict, MultiDictProxy
 
 from . import hdrs
 from .abc import AbstractCookieJar
@@ -329,17 +329,19 @@ def compile_format(self, log_format):
 
     @staticmethod
     def _format_e(key, args):
-        return (args[1] or {}).get(istr(key), '-')
+        return (args[1] or {}).get(key, '-')
 
     @staticmethod
     def _format_i(key, args):
         if not args[0]:
             return '(no headers)'
-        return args[0].headers.get(istr(key), '-')
+        # suboptimal, make istr(key) once
+        return args[0].headers.get(key, '-')
 
     @staticmethod
     def _format_o(key, args):
-        return args[2].headers.get(istr(key), '-')
+        # suboptimal, make istr(key) once
+        return args[2].headers.get(key, '-')
 
     @staticmethod
     def _format_a(args):

tests/test_helpers.py

@@ -165,9 +165,9 @@ def test_access_logger_dicts():
     log_format = '%{User-Agent}i %{Content-Length}o %{SPAM}e %{None}i'
     mock_logger = mock.Mock()
     access_logger = helpers.AccessLogger(mock_logger, log_format)
-    message = mock.Mock(headers={"USER-AGENT": "Mock/1.0"}, version=(1, 1))
+    message = mock.Mock(headers={"User-Agent": "Mock/1.0"}, version=(1, 1))
     environ = {"SPAM": "EGGS"}
-    response = mock.Mock(headers={"CONTENT-LENGTH": 123})
+    response = mock.Mock(headers={"Content-Length": 123})
     transport = mock.Mock()
     transport.get_extra_info.return_value = ("127.0.0.2", 1234)
     access_logger.log(message, environ, response, transport, 0.0)