changed using union for python 3.8

Author: DanChov

mergin/client.py

@@ -16,6 +16,8 @@
 import re
 import typing
 import warnings
+from enum import Enum
+from typing import Optional, Type, Union
 
 from .common import (
     ClientError,
@@ -1319,7 +1321,7 @@ def create_user(
         email: str,
         password: str,
         workspace_id: int,
-        workspace_role: str | WorkspaceRole,
+        workspace_role: Union[str, WorkspaceRole],
         username: str = None,
         notify_user: bool = False,
     ) -> dict:
@@ -1367,7 +1369,11 @@ def list_workspace_members(self, workspace_id: int) -> typing.List[dict]:
         return json.load(resp)
 
     def update_workspace_member(
-        self, workspace_id: int, user_id: int, workspace_role: str | WorkspaceRole, reset_projects_roles: bool = False
+        self,
+        workspace_id: int,
+        user_id: int,
+        workspace_role: Union[str, WorkspaceRole],
+        reset_projects_roles: bool = False,
     ) -> dict:
         """
         Update workspace role of a workspace member, optionally resets the projects role
@@ -1402,7 +1408,7 @@ def list_project_collaborators(self, project_id: str) -> typing.List[dict]:
         project_collaborators = self.get(f"v2/projects/{project_id}/collaborators")
         return json.load(project_collaborators)
 
-    def add_project_collaborator(self, project_id: str, user: str, project_role: ProjectRole | str) -> dict:
+    def add_project_collaborator(self, project_id: str, user: str, project_role: Union[str, ProjectRole]) -> dict:
         """
         Add a user to project collaborators and grant them a project role.
         Fails if user is already a member of the project.
@@ -1419,7 +1425,7 @@ def add_project_collaborator(self, project_id: str, user: str, project_role: Pro
         project_collaborator = self.post(f"v2/projects/{project_id}/collaborators", params, json_headers)
         return json.load(project_collaborator)
 
-    def update_project_collaborator(self, project_id: str, user_id: int, project_role: ProjectRole | str) -> dict:
+    def update_project_collaborator(self, project_id: str, user_id: int, project_role: Union[str, ProjectRole]) -> dict:
         """
         Update project role of the existing project collaborator.
         Fails if user is not a member of the project yet.
@@ -1506,7 +1512,7 @@ def send_logs(
             request = urllib.request.Request(url, data=payload, headers=header)
             return self._do_request(request)
 
-    def create_invitation(self, workspace_id: int, email: str, workspace_role: str | WorkspaceRole):
+    def create_invitation(self, workspace_id: int, email: str, workspace_role: Union[str, WorkspaceRole]):
         """
         Create invitation to workspace for specific role
         """

mergin/utils.py

@@ -7,6 +7,8 @@
 from datetime import datetime
 from pathlib import Path
 import tempfile
+from enum import Enum
+from typing import Optional, Type, Union
 from .common import ClientError, WorkspaceRole
 
 
@@ -311,7 +313,7 @@ def cleanup_tmp_dir(mp, tmp_dir: tempfile.TemporaryDirectory):
         mp.log.error(f"Error during tmp dir cleanup: {tmp_dir.name}: {e}")
 
 
-def normalize_role(role, enum_cls):
+def normalize_role(role: Union[str, Enum], enum_cls: Type[Enum]) -> Optional[Enum]:
     if isinstance(role, enum_cls):
         return role