Avoid with await redis_pool (#330)

Author: asvetlov

aiohttp_session/redis_storage.py

@@ -55,18 +55,17 @@ async def load_session(self, request: web.Request) -> Session:
         if cookie is None:
             return Session(None, data=None, new=True, max_age=self.max_age)
         else:
-            with await self._redis as conn:
-                key = str(cookie)
-                data = await conn.get(self.cookie_name + '_' + key)
-                if data is None:
-                    return Session(None, data=None,
-                                   new=True, max_age=self.max_age)
-                data = data.decode('utf-8')
-                try:
-                    data = self._decoder(data)
-                except ValueError:
-                    data = None
-                return Session(key, data=data, new=False, max_age=self.max_age)
+            key = str(cookie)
+            data = await self._redis.get(self.cookie_name + '_' + key)
+            if data is None:
+                return Session(None, data=None,
+                               new=True, max_age=self.max_age)
+            data = data.decode('utf-8')
+            try:
+                data = self._decoder(data)
+            except ValueError:
+                data = None
+            return Session(key, data=data, new=False, max_age=self.max_age)
 
     async def save_session(
         self,
@@ -89,7 +88,8 @@ async def save_session(
                                  max_age=session.max_age)
 
         data = self._encoder(self._get_session_data(session))
-        with await self._redis as conn:
-            max_age = session.max_age
-            expire = max_age if max_age is not None else 0
-            await conn.set(self.cookie_name + '_' + key, data, expire=expire)
+        max_age = session.max_age
+        expire = max_age if max_age is not None else 0
+        await self._redis.set(self.cookie_name + '_' + key,
+                              data,
+                              expire=expire)

tests/test_redis_storage.py

@@ -40,8 +40,7 @@ async def make_cookie(
     }
     value = json.dumps(session_data)
     key = uuid.uuid4().hex
-    with await redis as conn:
-        await conn.set('AIOHTTP_SESSION_' + key, value)
+    await redis.set('AIOHTTP_SESSION_' + key, value)
     # Ignoring type until aiohttp#4252 is released
     client.session.cookie_jar.update_cookies(
         {'AIOHTTP_SESSION': key}  # type: ignore
@@ -53,8 +52,7 @@ async def make_cookie_with_bad_value(
     redis: aioredis.commands.Redis
 ) -> None:
     key = uuid.uuid4().hex
-    with await redis as conn:
-        await conn.set('AIOHTTP_SESSION_' + key, '')
+    await redis.set('AIOHTTP_SESSION_' + key, '')
     # Ignoring type until aiohttp#4252 is released
     client.session.cookie_jar.update_cookies(
         {'AIOHTTP_SESSION': key}  # type: ignore
@@ -67,11 +65,10 @@ async def load_cookie(
 ) -> Any:
     cookies = client.session.cookie_jar.filter_cookies(client.make_url('/'))
     key = cookies['AIOHTTP_SESSION']
-    with await redis as conn:
-        encoded = await conn.get('AIOHTTP_SESSION_' + key.value)
-        s = encoded.decode('utf-8')
-        value = json.loads(s)
-        return value
+    encoded = await redis.get('AIOHTTP_SESSION_' + key.value)
+    s = encoded.decode('utf-8')
+    value = json.loads(s)
+    return value
 
 
 async def test_create_new_session(
@@ -207,9 +204,8 @@ async def handler(request: web.Request) -> web.StreamResponse:
     morsel = resp.cookies['AIOHTTP_SESSION']
     assert morsel['httponly']
     assert morsel['path'] == '/'
-    with await redis as conn:
-        exists = await conn.exists('AIOHTTP_SESSION_' + morsel.value)
-        assert exists
+    exists = await redis.exists('AIOHTTP_SESSION_' + morsel.value)
+    assert exists
 
 
 async def test_set_ttl_on_session_saving(
@@ -228,8 +224,7 @@ async def handler(request: web.Request) -> web.StreamResponse:
 
     key = resp.cookies['AIOHTTP_SESSION'].value
 
-    with await redis as conn:
-        ttl = await conn.ttl('AIOHTTP_SESSION_'+key)
+    ttl = await redis.ttl('AIOHTTP_SESSION_'+key)
 
     assert ttl > 9
     assert ttl <= 10
@@ -252,8 +247,7 @@ async def handler(request: web.Request) -> web.StreamResponse:
 
     key = resp.cookies['AIOHTTP_SESSION'].value
 
-    with await redis as conn:
-        ttl = await conn.ttl('AIOHTTP_SESSION_'+key)
+    ttl = await redis.ttl('AIOHTTP_SESSION_'+key)
 
     assert ttl > 9
     assert ttl <= 10
@@ -341,9 +335,8 @@ async def test_redis_from_create_pool(
     async def handler(request: web.Request) -> web.StreamResponse:
         pass
 
-    redis = await aioredis.create_pool(**redis_params)
-    with pytest.warns(DeprecationWarning):
-        create_app(handler=handler, redis=redis)
+    redis = await aioredis.create_redis(**redis_params)
+    create_app(handler=handler, redis=redis)
 
 
 async def test_not_redis_provided_to_storage() -> None: