Skip to content

Commit 936f763

Browse files
Bump aiomcache from 0.6.0 to 0.7.0 (#665)
* Bump aiomcache from 0.6.0 to 0.7.0 Bumps [aiomcache](https://github.com/aio-libs/aiomcache) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/aio-libs/aiomcache/releases) - [Changelog](https://github.com/aio-libs/aiomcache/blob/master/CHANGES.rst) - [Commits](aio-libs/aiomcache@v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: aiomcache dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Type fixes Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sam Bull <[email protected]> Co-authored-by: Sam Bull <[email protected]>
1 parent 29ddff3 commit 936f763

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

aiohttp_session/memcached_storage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class MemcachedStorage(AbstractStorage):
1313
"""Memcached storage"""
1414

15-
def __init__( # type: ignore[no-any-unimported] # TODO: aiomcache
15+
def __init__(
1616
self,
1717
memcached_conn: aiomcache.Client,
1818
*,
@@ -48,7 +48,7 @@ async def load_session(self, request: web.Request) -> Session:
4848
else:
4949
key = str(cookie)
5050
stored_key = (self.cookie_name + "_" + key).encode("utf-8")
51-
data = await self.conn.get(stored_key)
51+
data = await self.conn.get(stored_key) # type: ignore[call-overload]
5252
if data is None:
5353
return Session(None, data=None, new=True, max_age=self.max_age)
5454
data = data.decode("utf-8")

demo/memcached_storage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ async def handler(request: web.Request) -> web.Response:
1818

1919
async def make_app() -> web.Application:
2020
app = web.Application()
21-
mc = aiomcache.Client("127.0.0.1", 11211, loop=loop)
21+
mc = aiomcache.Client("127.0.0.1", 11211)
2222
setup(app, MemcachedStorage(mc))
2323
app.router.add_get("/", handler)
2424
return app

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-e .
22
aiohttp==3.8.1
3-
aiomcache==0.6.0
3+
aiomcache==0.7.0
44
aioredis==2.0.0
55
attrs==21.4.0
66
chardet==4.0.0

tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def memcached_server( # type: ignore[misc] # No docker types.
183183
delay = 0.1
184184
for _i in range(20):
185185
try:
186-
conn = aiomcache.Client(host, port, loop=event_loop)
186+
conn = aiomcache.Client(host, port)
187187
event_loop.run_until_complete(conn.set(b"foo", b"bar"))
188188
break
189189
except ConnectionRefusedError:
@@ -208,9 +208,9 @@ def memcached_params( # type: ignore[misc]
208208

209209

210210
@pytest.fixture
211-
def memcached( # type: ignore[misc]
211+
def memcached(
212212
event_loop: asyncio.AbstractEventLoop, memcached_params: _MemcachedParams
213213
) -> Iterator[aiomcache.Client]:
214-
conn = aiomcache.Client(loop=event_loop, **memcached_params)
214+
conn = aiomcache.Client(**memcached_params)
215215
yield conn
216216
event_loop.run_until_complete(conn.close())

tests/test_memcached_storage.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ async def load_cookie(
5454
cookies = client.session.cookie_jar.filter_cookies(client.make_url("/"))
5555
key = cookies["AIOHTTP_SESSION"]
5656
storage_key = ("AIOHTTP_SESSION_" + key.value).encode("utf-8")
57-
encoded = await memcached.get(storage_key)
57+
encoded = await memcached.get(storage_key) # type: ignore[call-overload]
5858
s = encoded.decode("utf-8")
5959
return cast(Dict[str, Any], json.loads(s))
6060

@@ -181,7 +181,7 @@ async def handler(request: web.Request) -> web.StreamResponse:
181181
assert morsel["httponly"]
182182
assert morsel["path"] == "/"
183183
storage_key = ("AIOHTTP_SESSION_" + morsel.value).encode("utf-8")
184-
exists = await memcached.get(storage_key)
184+
exists = await memcached.get(storage_key) # type: ignore[call-overload]
185185
assert exists
186186

187187

@@ -298,7 +298,7 @@ async def get_value(request: web.Request) -> web.StreamResponse:
298298
storage_key = ("AIOHTTP_SESSION_" + resp.cookies["AIOHTTP_SESSION"].value).encode(
299299
"utf-8"
300300
)
301-
storage_value = await memcached.get(storage_key)
301+
storage_value = await memcached.get(storage_key) # type: ignore[call-overload]
302302
storage_value = json.loads(storage_value.decode("utf-8"))
303303
assert storage_value["session"]["stored"] == "TEST_VALUE"
304304

0 commit comments

Comments
 (0)