replace @abstractproperty (#287)

Author: dantownsend

piccolo_api/change_password/endpoints.py

@@ -2,7 +2,7 @@
 
 import os
 import typing as t
-from abc import ABCMeta, abstractproperty
+from abc import ABCMeta, abstractmethod
 from json import JSONDecodeError
 
 from jinja2 import Environment, FileSystemLoader
@@ -31,27 +31,33 @@
 
 
 class ChangePasswordEndpoint(HTTPEndpoint, metaclass=ABCMeta):
-    @abstractproperty
+    @property
+    @abstractmethod
     def _login_url(self) -> str:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _change_password_template(self) -> Template:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _styles(self) -> Styles:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _session_table(self) -> t.Optional[t.Type[SessionsBase]]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _session_cookie_name(self) -> t.Optional[str]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _read_only(self) -> bool:
         raise NotImplementedError
 

piccolo_api/jwt_auth/endpoints.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import typing as t
-from abc import abstractproperty
+from abc import abstractmethod
 from datetime import datetime, timedelta, timezone
 
 import jwt
@@ -13,15 +13,18 @@
 
 
 class JWTLoginBase(HTTPEndpoint):
-    @abstractproperty
+    @property
+    @abstractmethod
     def _auth_table(self) -> t.Type[BaseUser]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _secret(self) -> str:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _expiry(self) -> timedelta:
         raise NotImplementedError
 

piccolo_api/register/endpoints.py

@@ -3,7 +3,7 @@
 import os
 import re
 import typing as t
-from abc import ABCMeta, abstractproperty
+from abc import ABCMeta, abstractmethod
 from json import JSONDecodeError
 
 from jinja2 import Environment, FileSystemLoader
@@ -36,34 +36,41 @@
 
 
 class RegisterEndpoint(HTTPEndpoint, metaclass=ABCMeta):
-    @abstractproperty
+    @property
+    @abstractmethod
     def _auth_table(self) -> t.Type[BaseUser]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _redirect_to(self) -> t.Union[str, URL]:
         """
         Where to redirect to after login is successful.
         """
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _register_template(self) -> Template:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _user_defaults(self) -> t.Optional[t.Dict[str, t.Any]]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _captcha(self) -> t.Optional[Captcha]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _styles(self) -> Styles:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _read_only(self) -> bool:
         raise NotImplementedError
 

piccolo_api/session_auth/endpoints.py

@@ -3,7 +3,7 @@
 import os
 import typing as t
 import warnings
-from abc import ABCMeta, abstractproperty
+from abc import ABCMeta, abstractmethod
 from datetime import datetime, timedelta
 from json import JSONDecodeError
 
@@ -39,23 +39,28 @@
 
 
 class SessionLogoutEndpoint(HTTPEndpoint, metaclass=ABCMeta):
-    @abstractproperty
+    @property
+    @abstractmethod
     def _session_table(self) -> t.Type[SessionsBase]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _cookie_name(self) -> str:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _redirect_to(self) -> t.Optional[str]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _logout_template(self) -> Template:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _styles(self) -> t.Optional[Styles]:
         raise NotImplementedError
 
@@ -102,53 +107,64 @@ async def post(self, request: Request) -> Response:
 
 
 class SessionLoginEndpoint(HTTPEndpoint, metaclass=ABCMeta):
-    @abstractproperty
+    @property
+    @abstractmethod
     def _auth_table(self) -> t.Type[BaseUser]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _session_table(self) -> t.Type[SessionsBase]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _session_expiry(self) -> timedelta:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _max_session_expiry(self) -> timedelta:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _cookie_name(self) -> str:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _redirect_to(self) -> t.Optional[str]:
         """
         Where to redirect to after login is successful.
         """
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _production(self) -> bool:
         """
         If True, apply more stringent security.
         """
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _login_template(self) -> Template:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _hooks(self) -> t.Optional[LoginHooks]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _captcha(self) -> t.Optional[Captcha]:
         raise NotImplementedError
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def _styles(self) -> t.Optional[Styles]:
         raise NotImplementedError