Merge pull request #1954 from glensc/decorated

Refactor: Use decorator package to make decorators

Pipfile

@@ -12,6 +12,7 @@ cattrs = {version="==23.2.3", python_version=">='3.7'"}
 certifi = "==2024.2.2"
 charset-normalizer = "==3.3.2"
 click = "==8.1.7"
+decorator = "==5.1.1"
 deprecated = "==1.2.14"
 humanize = "==4.9.0"
 idna = {version="==3.7", python_version=">='3.5'"}

plextraktsync/decorators/coro.py

@@ -1,15 +1,13 @@
 import asyncio
-from functools import wraps
 
+from decorator import decorator
 
-def coro(f):
+
+@decorator
+def coro(f, *args, **kwargs):
     """
     Decorator to get started with async/await with click
 
     https://github.com/pallets/click/issues/85#issuecomment-503464628
     """
-    @wraps(f)
-    def wrapper(*args, **kwargs):
-        return asyncio.run(f(*args, **kwargs))
-
-    return wrapper
+    return asyncio.run(f(*args, **kwargs))

plextraktsync/decorators/flatten.py

@@ -1,25 +1,16 @@
-from functools import wraps
+from decorator import decorator
 
 
-def flatten_list(method):
-    @wraps(method)
-    def inner(*args, **kwargs):
-        return list(method(*args, **kwargs))
+@decorator
+def flatten_list(method, *args, **kwargs):
+    return list(method(*args, **kwargs))
 
-    return inner
 
+@decorator
+def flatten_dict(method, *args, **kwargs):
+    return dict(method(*args, **kwargs))
 
-def flatten_dict(method):
-    @wraps(method)
-    def inner(*args, **kwargs):
-        return dict(method(*args, **kwargs))
 
-    return inner
-
-
-def flatten_set(method):
-    @wraps(method)
-    def inner(*args, **kwargs):
-        return set(method(*args, **kwargs))
-
-    return inner
+@decorator
+def flatten_set(method, *args, **kwargs):
+    return set(method(*args, **kwargs))

plextraktsync/decorators/nocache.py

@@ -1,14 +1,11 @@
-from functools import wraps
+from decorator import decorator
 
 from plextraktsync.factory import factory
 
 session = factory.session
 
 
-def nocache(method):
-    @wraps(method)
-    def inner(*args, **kwargs):
-        with session.cache_disabled():
-            return method(*args, **kwargs)
-
-    return inner
+@decorator
+def nocache(method, *args, **kwargs):
+    with session.cache_disabled():
+        return method(*args, **kwargs)