Order arguments consistently (#336)

pottery/deque.py

@@ -130,7 +130,7 @@ def rotate(self, n: int = 1) -> None:
                 push_method = 'lpush' if n > 0 else 'rpush'
                 values = self[-n:][::-1] if n > 0 else self[:-n]
                 encoded_values = (self._encode(element) for element in values)
-                trim_indices = (0, len(self)-1) if n > 0 else (-n, len(self)-n-1)
+                trim_indices = (0, len(self)-1) if n > 0 else (-n, len(self)-1-n)
 
                 pipeline.multi()
                 getattr(pipeline, push_method)(self.key, *encoded_values)

pottery/exceptions.py

@@ -46,18 +46,18 @@ def __str__(self) -> str:
 class PrimitiveError(Exception):
     'Base exception class for distributed primitives.'
 
-    def __init__(self, masters: Iterable[Redis], key: str) -> None:
+    def __init__(self, key: str, masters: Iterable[Redis]) -> None:
         self._masters = masters
         self._key = key
 
     def __repr__(self) -> str:
         return (
-            f"{self.__class__.__name__}(masters={list(self._masters)}, "
-            f"key='{self._key}')"
+            f"{self.__class__.__name__}(key='{self._key}', "
+            f"masters={list(self._masters)})"
         )
 
     def __str__(self) -> str:
-        return f"masters={list(self._masters)}, key='{self._key}'"
+        return f"key='{self._key}', masters={list(self._masters)}"
 
 class QuorumNotAchieved(PrimitiveError, RuntimeError):
     ...

pottery/nextid.py

@@ -123,7 +123,7 @@ def __next__(self) -> int:
                 self.__current_id = next_id
                 return next_id
         else:
-            raise QuorumNotAchieved(self.masters, self.key)
+            raise QuorumNotAchieved(self.key, self.masters)
 
     def __repr__(self) -> str:
         return (
@@ -157,7 +157,7 @@ def __current_id(self) -> int:
         if quorum:
             return max(current_ids)
         else:
-            raise QuorumNotAchieved(self.masters, self.key)
+            raise QuorumNotAchieved(self.key, self.masters)
 
     @__current_id.setter
     def __current_id(self, value: int) -> None:
@@ -190,7 +190,7 @@ def __current_id(self, value: int) -> None:
                         break
 
         if not quorum:
-            raise QuorumNotAchieved(self.masters, self.key)
+            raise QuorumNotAchieved(self.key, self.masters)
 
 
 if __name__ == '__main__':

pottery/redlock.py

@@ -420,7 +420,7 @@ def extend(self) -> None:
             >>> printer_lock.release()
         '''
         if self._extension_num >= self.num_extensions:
-            raise TooManyExtensions(self.masters, self.key)
+            raise TooManyExtensions(self.key, self.masters)
         else:
             quorum = False
 
@@ -447,7 +447,7 @@ def extend(self) -> None:
 
             self._extension_num += quorum
             if not quorum:
-                raise ExtendUnlockedLock(self.masters, self.key)
+                raise ExtendUnlockedLock(self.key, self.masters)
 
     def release(self) -> None:
         '''Unlock the lock.
@@ -489,7 +489,7 @@ def release(self) -> None:
                         break
 
         if not quorum:
-            raise ReleaseUnlockedLock(self.masters, self.key)
+            raise ReleaseUnlockedLock(self.key, self.masters)
 
     __release = release
 

tests/test_redlock.py

@@ -107,17 +107,17 @@ def test_releaseunlockedlock_repr(self):
             self.redlock.release()
         except ReleaseUnlockedLock as wtf:
             assert repr(wtf) == (
-                f"ReleaseUnlockedLock(masters=[Redis<ConnectionPool<Connection<host=localhost,port=6379,db={self.redis_db}>>>], "
-                "key='redlock:printer')"
+                "ReleaseUnlockedLock(key='redlock:printer', "
+                f"masters=[Redis<ConnectionPool<Connection<host=localhost,port=6379,db={self.redis_db}>>>])"
             )
 
     def test_releaseunlockedlock_str(self):
         try:
             self.redlock.release()
         except ReleaseUnlockedLock as wtf:
             assert str(wtf) == (
-                f"masters=[Redis<ConnectionPool<Connection<host=localhost,port=6379,db={self.redis_db}>>>], "
-                "key='redlock:printer'"
+                "key='redlock:printer', "
+                f"masters=[Redis<ConnectionPool<Connection<host=localhost,port=6379,db={self.redis_db}>>>]"
             )
 
     def test_release_same_lock_twice(self):