Merge pull request #657 from embar-/patch-1

Make SafeEyes compatible with Python 3.6 again

safeeyes/model.py

@@ -24,6 +24,7 @@
 import random
 from enum import Enum
 from dataclasses import dataclass
+from typing import Optional, Union
 
 from packaging.version import parse
 
@@ -424,11 +425,11 @@ def build(cls, name, icon_path, icon_id, action):
 @dataclass
 class PluginDependency:
     message: str
-    link: str|None = None
+    link: Optional[str] = None
     retryable: bool = False
 
 class RequiredPluginException(Exception):
-    def __init__(self, plugin_id, plugin_name: str, message: str|PluginDependency):
+    def __init__(self, plugin_id, plugin_name: str, message: Union[str, PluginDependency]):
         if isinstance(message, PluginDependency):
             msg = message.message
         else:

safeeyes/plugins/healthstats/plugin.py

@@ -55,7 +55,8 @@ def init(ctx, safeeyes_config, plugin_config):
             'total_resets': 0,
         }
 
-        session = context['session']['plugin'].get('healthstats', {}) | defaults
+        session = context['session']['plugin'].get('healthstats', {}).copy()
+        session.update(defaults)
         if 'no_of_breaks' in session:
             # Ignore old format session.
             session = defaults