oldaplib 0.3.8__py3-none-any.whl → 0.3.9__py3-none-any.whl

oldaplib/src/helpers/observable_set.py

@@ -80,7 +80,7 @@ class ObservableSet(Notify):
     def __str__(self) -> str:
         return str(self._setdata)
 
-    def __eq__(self, other: Iterable) -> bool:
+    def __eq__(self, other: Iterable[Any]) -> bool:
         if isinstance(other, ObservableSet):
             return self._setdata == other._setdata
         elif isinstance(other, set):
@@ -90,7 +90,7 @@ class ObservableSet(Notify):
         else:
             raise OldapErrorNotImplemented(f'Set.__eq__() not implemented for {type(other).__name__}')
 
-    def __or__(self, other: Iterable) -> Self:
+    def __or__(self, other: Iterable[Any]) -> Self:
         if isinstance(other, ObservableSet):
             return ObservableSet(self._setdata.__or__(other._setdata), self._notifier, self._notify_data)
         elif isinstance(other, set):
@@ -100,25 +100,24 @@ class ObservableSet(Notify):
         else:
             raise OldapErrorNotImplemented(f'Set.__or__() not implemented for {type(other).__name__}')
 
-    def __ror__(self, other: Self) -> Self:
-        pass
+    def __ror__(self, other: Iterable[Any]) -> Self:
+        return ObservableSet(set(other).__or__(self._setdata), self._notifier, self._notify_data)
+
+    def __rsub__(self, other: Iterable[Any]) -> Self:
+        return ObservableSet(set(other).__sub__(self._setdata), self._notifier, self._notify_data)
 
-    def __ior__(self, other: Iterable) -> Self:
+    def __ior__(self, other: Iterable[Any]) -> Self:
         tmp_copy = deepcopy(self)
         if isinstance(other, ObservableSet):
             self._setdata.__ior__(other._setdata)
-        elif isinstance(other, set):
-            self._setdata.__ior__(other)
-        elif isinstance(other, Iterable):
-            return ObservableSet(self._setdata.__ior__(set(other)), self._notifier, self._notify_data)
         else:
-            raise OldapErrorNotImplemented(f'Set.i__or__() not implemented for {type(other).__name__}')
+            self._setdata.__ior__(set(other))
         if not self._old_value:
             self._old_value = tmp_copy
         self.notify()
         return self
 
-    def __and__(self, other: Iterable) -> Self:
+    def __and__(self, other: Iterable[Any]) -> Self:
         if isinstance(other, ObservableSet):
             return ObservableSet(self._setdata.__and__(other._setdata), self._notifier, self._notify_data)
         elif isinstance(other, set):
@@ -128,7 +127,7 @@ class ObservableSet(Notify):
         else:
             raise OldapErrorNotImplemented(f'Set.__and__() not implemented for {type(other).__name__}')
 
-    def __iand__(self, other: Iterable) -> Self:
+    def __iand__(self, other: Iterable[Any]) -> Self:
         tmp_copy = deepcopy(self)
         if isinstance(other, ObservableSet):
             self._setdata.__iand__(other._setdata)
@@ -146,7 +145,7 @@ class ObservableSet(Notify):
     def __rsub__(self, other: Self) -> Self:
         pass
 
-    def __sub__(self, other: Iterable) -> Self:
+    def __sub__(self, other: Iterable[Any]) -> Self:
         if isinstance(other, ObservableSet):
             return ObservableSet(self._setdata.__sub__(other._setdata), self.notify, self._notify_data)
         elif isinstance(other, set):
@@ -156,7 +155,7 @@ class ObservableSet(Notify):
         else:
             raise OldapErrorNotImplemented(f'Set.__sub__() not implemented for {type(other).__name__}')
 
-    def __isub__(self, other: Iterable) -> Self:
+    def __isub__(self, other: Iterable[Any]) -> Self:
         tmp_copy = deepcopy(self)
         if isinstance(other, ObservableSet):
             self._setdata.__isub__(other._setdata)
@@ -171,34 +170,45 @@ class ObservableSet(Notify):
         self.notify()
         return self
 
-    def update(self, items: Iterable):
+    @classmethod
+    def coerce(cls, value: Iterable[Any], *, notifier=None, notify_data=None) -> "ObservableSet":
+        return value if isinstance(value, cls) else cls(value, notifier=notifier, notify_data=notify_data)
+
+    def update(self, items: Iterable[Any]):
         tmp_copy = deepcopy(self)
         self._setdata.update(items)
         if not self._old_value:
             self._old_value = tmp_copy
         self.notify()
 
-    def intersection_update(self, items: Iterable):
+    def intersection_update(self, items: Iterable[Any]):
         tmp_copy = deepcopy(self)
         self._setdata.intersection_update(items)
         if not self._old_value:
             self._old_value = tmp_copy
         self.notify()
 
-    def difference_update(self, items: Iterable):
+    def difference_update(self, items: Iterable[Any]):
         tmp_copy = deepcopy(self)
         self._setdata.difference_update(items)
         if not self._old_value:
             self._old_value = tmp_copy
         self.notify()
 
-    def symmetric_difference_update(self, items: Iterable):
+    def symmetric_difference_update(self, items: Iterable[Any]):
         tmp_copy = deepcopy(self)
         self._setdata.symmetric_difference_update(items)
         if not self._old_value:
             self._old_value = tmp_copy
         self.notify()
 
+    def replace(self, items: Iterable[Any]) -> None:
+        tmp_copy = deepcopy(self)
+        self._setdata = set(items)
+        if not self._old_value:
+            self._old_value = tmp_copy
+        self.notify()
+
     def add(self, item: Any) -> None:
         tmp_copy = deepcopy(self)
         self._setdata.add(item)

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.8"
+__version__ = "0.3.9"

{oldaplib-0.3.8.dist-info → oldaplib-0.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oldaplib
-Version: 0.3.8
+Version: 0.3.9
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler

{oldaplib-0.3.8.dist-info → oldaplib-0.3.9.dist-info}/RECORD

@@ -48,7 +48,7 @@ oldaplib/src/helpers/json_encoder.py,sha256=c78h9uf58zfLaK8X7S1KCK4otY3iEltGnPBy
 oldaplib/src/helpers/langstring.py,sha256=KfyYisMKEYstv-CUPlKkjMg9fbTjrOV3IDn2HOUfdtY,30350
 oldaplib/src/helpers/numeric.py,sha256=swRKU51zbwss9UDGTC6FzhTTPK_BVfy5On0KCK-zZnQ,966
 oldaplib/src/helpers/observable_dict.py,sha256=w_I4fG8tKBibimcmSxeKgvDF-zy2aHSBUluXIBeNCHE,3287
-oldaplib/src/helpers/observable_set.py,sha256=xB7PB1ko5mA2-sQqwvAUA_xAuT-RGAcwjF1B5Gw0g_4,13966
+oldaplib/src/helpers/observable_set.py,sha256=IWkcgMBh5P-J3TkLijyaLmvxLqmAPdp-ayNkJKD_qf0,14427
 oldaplib/src/helpers/oldaperror.py,sha256=2gKgV8FYiEjbcox1KN1PlOIPY4KclxVTnCIOQ6Ivvc0,1321
 oldaplib/src/helpers/query_processor.py,sha256=1RJnQ9u6BS58xK0PcTbffzF2W-_K42kw37Vbh2HO5sA,10369
 oldaplib/src/helpers/semantic_version.py,sha256=HLFQO2CPVDz_GKZaFCjR5q_G-aSLQ2XYohCA2tCU9go,3218
@@ -70,7 +70,7 @@ oldaplib/src/propertyclass.py,sha256=pnaDsmyGKQnJaaOHXA0XyLcp4zn1b1vC9sLbjXls4lM
 oldaplib/src/resourceclass.py,sha256=EIxyd7Z_w59wDxWLXCaLvhhvh5SjLEUWb8gqmZz8LLM,102046
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=kd0YV9qLZ1Lpx7vbSzAMrAwjgdZJD_tInTnDqY6-nTY,21
+oldaplib/src/version.py,sha256=7YeBgSVj8ydF7tymPSFdq22NONiQoBjKL1iwcxp4TJo,21
 oldaplib/src/xsd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/xsd/floatingpoint.py,sha256=rDReKqh0mXyc4F5wslgTUxbeGf3-PGERyughj5_62YI,8852
 oldaplib/src/xsd/iri.py,sha256=w1Dr0z-REi7yPe3GPGnyzGrLVMvLY03kEeK-AmZ9sxw,8383
@@ -157,6 +157,6 @@ oldaplib/testdata/source_type.yaml,sha256=dSihKikw3O-IlGf6anj5KWMoBYLaweLVF1Zojm
 oldaplib/testdata/test_move_left_of_toL.yaml,sha256=2m1OSQrQFlsCQxeJrjzBAO74LMprNDo_HuyrYGsOeXI,787
 oldaplib/testdata/testlist.yaml,sha256=AT11nXEG81Sfyb-tr1gQV0H_dZBrOCcFuHf7YtL8P2g,1994
 oldaplib/testit.http,sha256=qW7mnr6aNLXFG6lQdLgyhXILOPN6qc5iFVZclLyVvkY,303
-oldaplib-0.3.8.dist-info/METADATA,sha256=N4D0KOzlouWjyXz5ooC6ld_LhEblkrJNVfuSwwqPTMA,2854
-oldaplib-0.3.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-oldaplib-0.3.8.dist-info/RECORD,,
+oldaplib-0.3.9.dist-info/METADATA,sha256=ncha961sACYOwWBsWQKJAqOQBNl06LMs-FwdLm7neA8,2854
+oldaplib-0.3.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+oldaplib-0.3.9.dist-info/RECORD,,