1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
| | Index: gfeeds-2.2.0/gfeeds/conf_mapper.py
===================================================================
--- gfeeds-2.2.0.orig/gfeeds/conf_mapper.py
+++ gfeeds-2.2.0/gfeeds/conf_mapper.py
@@ -1,4 +1,4 @@
-from typing import Dict, List, Literal, cast
+from typing import Dict, List, Literal, Union, cast
from gfeeds.gsettings_wrapper import GSETTINGS_TYPES, GsettingsWrapper
@@ -9,7 +9,8 @@ class ConfMapper:
@property
def feeds(self) -> Dict[
str,
- Dict[Literal['tags', 'last-modified'], List[str] | str]
+ Dict[Literal['tags', 'last-modified'],
+ Union[List[str], str]]
]:
return cast(dict, self.gsw.get('feeds'))
Index: gfeeds-2.2.0/gfeeds/gsettings_wrapper.py
===================================================================
--- gfeeds-2.2.0.orig/gfeeds/gsettings_wrapper.py
+++ gfeeds-2.2.0/gfeeds/gsettings_wrapper.py
@@ -80,19 +80,18 @@ class GsettingsWrapper:
def set(self, key: str, value: GSETTINGS_TYPES):
key = self.convert_and_check_key(key)
- match value:
- case str(value):
- self.gs.set_string(key, value)
- case dict(value) | list(value):
- self.set(key, json.dumps(value, cls=CustomJSONEncoder))
- case bool(value):
- self.gs.set_boolean(key, value)
- case int(value):
- self.gs.set_int(key, value)
- case float(value):
- self.gs.set_double(key, value)
- case _:
- return self.__type_err()
+ if isinstance(value, str):
+ self.gs.set_string(key, value)
+ elif isinstance(value, dict) or isinstance(value, list):
+ self.set(key, json.dumps(value, cls=CustomJSONEncoder))
+ elif isinstance(value, bool):
+ self.gs.set_boolean(key, value)
+ elif isinstance(value, int):
+ self.gs.set_int(key, value)
+ elif isinstance(value, float):
+ self.gs.set_double(key, value)
+ else:
+ return self.__type_err()
def __type_err(self):
raise TypeError(
Index: gfeeds-2.2.0/gfeeds/signal_helper.py
===================================================================
--- gfeeds-2.2.0.orig/gfeeds/signal_helper.py
+++ gfeeds-2.2.0/gfeeds/signal_helper.py
@@ -1,7 +1,7 @@
-from typing import Literal, Tuple, Type
+from typing import Literal, Tuple, Union, Type
from gi.repository import GObject
-SignalReturnType = (
+SignalReturnType = Union[
Literal[
GObject.TYPE_INT,
GObject.TYPE_BOOLEAN,
@@ -11,9 +11,8 @@ SignalReturnType = (
GObject.TYPE_STRING,
GObject.TYPE_NONE,
GObject.TYPE_PYOBJECT,
- ]
- | None
-)
+ ], None
+]
def signal_tuple(
|