Merge pull request #126 from icgood/mbx

Fix mailbox CRUD operations on redis

pymap/backend/redis/mailbox.py

@@ -282,19 +282,13 @@ def delimiter(self) -> str:
         return '/'
 
     async def set_subscribed(self, name: str, subscribed: bool) -> None:
-        async with self._redis.pipeline() as multi:
-            multi.unwatch()
-            if subscribed:
-                multi.sadd(self._keys.subscribed, name)
-            else:
-                multi.srem(self._keys.subscribed, name)
-            await multi.execute()
+        if subscribed:
+            await self._redis.sadd(self._keys.subscribed, name)
+        else:
+            await self._redis.srem(self._keys.subscribed, name)
 
     async def list_subscribed(self) -> ListTree:
-        async with self._redis.pipeline() as multi:
-            multi.unwatch()
-            multi.smembers(self._keys.subscribed)
-            _, mailboxes = await multi.execute()
+        mailboxes = await self._redis.smembers(self._keys.subscribed)
         return ListTree(self.delimiter).update('INBOX', *(
             modutf7_decode(name) for name in mailboxes))
 
@@ -342,11 +336,11 @@ async def delete_mailbox(self, name: str) -> None:
 
     async def rename_mailbox(self, before: str, after: str) -> None:
         redis = self._redis
-        async with redis.pipeline() as multi:
-            multi.unwatch()
-            multi.watch(self._keys.mailboxes)
-            multi.hgetall(self._keys.mailboxes)
-            _, _, all_keys = await multi.execute()
+        async with redis.pipeline() as pipe:
+            await pipe.watch(self._keys.mailboxes)
+            pipe.multi()
+            pipe.hgetall(self._keys.mailboxes)
+            all_keys, = await pipe.execute()
         all_mbx = {modutf7_decode(key): ns for key, ns in all_keys.items()}
         tree = ListTree(self.delimiter).update('INBOX', *all_mbx.keys())
         before_entry = tree.get(before)

pymap/health.py

@@ -2,8 +2,7 @@
 from __future__ import annotations
 
 import logging
-from collections.abc import Callable, Iterator
-from itertools import chain
+from collections.abc import Callable
 from types import MethodType
 from typing import Any, Optional
 from weakref import finalize, ref, WeakMethod, WeakSet
@@ -79,13 +78,6 @@ def _check(self, seen: set[HealthStatus]) -> None:
                 if watcher not in seen:
                     watcher._check(seen)
 
-    def walk(self) -> Iterator[HealthStatus]:
-        """Traverses the tree of :class:`HealthStatus` objects rooted at this
-        object, breadth-first.
-
-        """
-        return chain([self], *(dep.walk() for dep in self._dependencies))
-
     def new_dependency(self, initial: bool = True, *,
                        name: str = '') -> HealthStatus:
         """Adds a new health status as a dependency of this status. All

setup.py

@@ -28,7 +28,7 @@
     license = f.read()
 
 setup(name='pymap',
-      version='0.26.0',
+      version='0.26.1',
       author='Ian Good',
       author_email='ian@icgood.net',
       description='Lightweight, asynchronous IMAP serving in Python.',

test/test_health.py

@@ -34,14 +34,6 @@ def test_name(self) -> None:
         child3 = child1.new_dependency(name='oof')
         self.assertEqual('foo.bar.oof', child3.name)
 
-    def test_walk(self) -> None:
-        status = HealthStatus(name='foo')
-        child1 = status.new_dependency(name='bar')
-        child2 = status.new_dependency(name='baz')
-        child3 = child1.new_dependency(name='oof')
-        tree = list(status.walk())
-        self.assertEqual([status, child1, child3, child2], tree)
-
     def test_set(self) -> None:
         status = HealthStatus()
         self.assertTrue(status.healthy)