Linting fixes.

Author: chisou

c8y_api/model/_base.py

@@ -91,8 +91,8 @@ def __len__(self):
     #     if self.__dict__['_property_on_update']:
     #         self.__dict__['_property_on_update']()
 
-    def insert(self, i, value):
-        self.__dict__['_property_items'].insert(i, value)
+    def insert(self, index, value):
+        self.__dict__['_property_items'].insert(index, value)
         if self.__dict__['_property_on_update']:
             self.__dict__['_property_on_update']()
 
@@ -123,7 +123,7 @@ def _repr(self, *names) -> str:
             '(',
             ', '.join(filter(lambda x: x is not None,
                          [
-                             f'{n}={self.__getattribute__(n)}' if self.__getattribute__(n) else None
+                             f'{n}={getattr(self, n)}' if getattr(self, n) else None
                              for n in ['id', *names]
                          ])),
             ')'])
@@ -353,7 +353,7 @@ def _delete(self, **params):
         self._assert_id()
         self.c8y.delete(self._build_object_path(), params=params)
 
-    def delete(self, **_):
+    def delete(self, **_) -> None:
         """Delete the object within the database."""
         self._delete()
 
@@ -719,7 +719,7 @@ def _apply_to(self, jsonify_func, model: dict|Any, *object_ids):
             self.c8y.put(self.resource + '/' + str(object_id), model_json, accept=None)
 
     # this one should be ok for all implementations, hence we define it here
-    def delete(self, *objects: str):
+    def delete(self, *objects: str) -> None:
         """ Delete one or more objects within the database.
 
         The objects can be specified as instances of a database object

c8y_api/model/_util.py

@@ -14,10 +14,12 @@ class _StringUtil(object):
 
     @staticmethod
     def concat(*strings:Union[str, None]):
+        """Concatenate non-None strings."""
         return ''.join(x for x in strings if x)
 
     @staticmethod
     def concat_with(sep: str, *strings:Union[str, None]):
+        """Concatenate non-None strings with separator."""
         return sep.join(x for x in strings if x)
 
     @staticmethod

c8y_api/model/administration.py

@@ -179,7 +179,7 @@ def update(self) -> InventoryRole:
         """
         return super()._update()
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """Delete the role within the database."""
         super()._delete()
 
@@ -291,7 +291,7 @@ def update(self) -> GlobalRole:
         """
         return super()._update()
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """Delete the GlobalRole within the database."""
         super()._delete()
 
@@ -594,7 +594,7 @@ def update(self) -> User:
         result_json = self.c8y.put(self._build_user_path(), self.to_diff_json(), accept=self._accept)
         return self.from_json(result_json)
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """Delete the User within the database."""
         self._delete()
 
@@ -895,7 +895,7 @@ def verify_totp(self, code: str):
         try:
             self.c8y.post(f'{self._resource}/totpSecret/verify', {'code': code})
         except AccessDeniedError as ex:
-            raise ValueError(ex.message)
+            raise ValueError(ex.message) from ex
 
     def is_valid_totp(self, code: str) -> bool:
         """Verify a TFA/TOTP token.

c8y_api/model/alarms.py

@@ -197,7 +197,7 @@ def apply_to(self, other_id: str) -> Alarm:
         """
         return super()._apply_to(other_id)
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """Delete this object within the database.
 
         An alarm is identified through its type and source. These fields
@@ -492,7 +492,7 @@ def apply_by(
             **kwargs)
         self.c8y.put(base_query, alarm.to_full_json(), accept='')
 
-    def delete(self, *alarms):
+    def delete(self, *alarms) -> None:
         """Delete alarm objects within the database.
 
         Note: within Cumulocity alarms are identified by type and source.

c8y_api/model/applications.py

@@ -134,7 +134,7 @@ def update(self) -> Application:
         """
         return super()._update()
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """Delete the Application within the database."""
         super()._delete()
 

c8y_api/model/events.py

@@ -129,7 +129,7 @@ def update(self) -> Event:
         """
         return super()._update()
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """Delete the Event within the database."""
         super()._delete()
 
@@ -205,7 +205,7 @@ def update_attachment(self, file: str | BinaryIO, content_type: str = None) -> d
         return self.c8y.put_file(self._build_attachment_path(), file,
                                  accept='application/json', content_type=content_type)
 
-    def delete_attachment(self):
+    def delete_attachment(self) -> None:
         """Remove the binary attachment."""
         super()._assert_c8y()
         super()._assert_id()
@@ -543,7 +543,7 @@ def download_attachment(self, event_id: str) -> bytes:
         """
         return self.c8y.get_file(self.build_attachment_path(event_id))
 
-    def delete_attachment(self, event_id: str):
+    def delete_attachment(self, event_id: str) -> None:
         """Remove an event's binary attachment.
 
         Args:

c8y_api/model/identity.py

@@ -81,7 +81,7 @@ def create(self) -> ExternalId:
         Identity(self.c8y).create(self.external_id, self.external_type, self.managed_object_id)
         return self
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """ Remove the external ID from the database.
 
         Returns:
@@ -109,11 +109,6 @@ def get_object(self) -> ManagedObject:
         self._assert_c8y()
         return Identity(self.c8y).get_object(self.external_id, self.external_type)
 
-    def __repr__(self):
-        return str({'external_id': self.external_id,
-                    'external_type': self.external_type,
-                    'object_id': self.managed_object_id})
-
 
 class Identity(object):
     # the Identity API of C8Y uses inconsistent resource paths and therefore
@@ -151,7 +146,7 @@ def create(self, external_id, external_type, managed_object_id):
         path = f'/identity/globalIds/{managed_object_id}/externalIds'
         self.c8y.post(path, body_json)
 
-    def delete(self, external_id, external_type):
+    def delete(self, external_id, external_type) -> None:
         """ Remove an External ID from the database.
 
         Args:

c8y_api/model/inventory.py

@@ -288,6 +288,7 @@ def _collate_filter_params(
             text: str = None,
             **kwargs,
     ) -> dict:
+        # pylint: disable=too-many-branches
         query_key = 'q' if only_devices else 'query'
 
         # if query is directly specified -> use it and ignore everything else
@@ -665,7 +666,7 @@ def get_count(  # noqa (changed signature)
             page_size=1,
             **kwargs))
 
-    def delete(self, *devices: Device):
+    def delete(self, *devices: Device) -> None:
         """ Delete one or more devices and the corresponding within the database.
 
         The objects can be specified as instances of a database object
@@ -961,7 +962,7 @@ def unassign_children(self, root_id, *child_ids):
         refs = {'references': [ManagedObjectUtil.build_managed_object_reference(i) for i in child_ids]}
         self.c8y.delete(self.build_object_path(root_id) + '/childAssets', json=refs)
 
-    def delete(self, *groups: DeviceGroup | str):
+    def delete(self, *groups: DeviceGroup | str) -> None:
         """Delete one or more single device groups within the database.
 
         The child groups (if there are any) are left dangling. This is
@@ -973,7 +974,7 @@ def delete(self, *groups: DeviceGroup | str):
         """
         self._delete(False, *groups)
 
-    def delete_trees(self, *groups: DeviceGroup | str):
+    def delete_trees(self, *groups: DeviceGroup | str) -> None:
         """Delete one or more device groups trees within the database.
 
         This is equivalent to using the `cascade=true` parameter in the

c8y_api/model/managedobjects.py

@@ -9,7 +9,7 @@
 from c8y_api.model.administration import User, Users
 from c8y_api.model._base import _DictWrapper, SimpleObject, ComplexObject
 from c8y_api.model._parser import ComplexObjectParser
-from c8y_api.model._util import _DateUtil, _StringUtil
+from c8y_api.model._util import _DateUtil
 
 
 class NamedObject(object):
@@ -433,7 +433,7 @@ def apply_to(self, other_id: str | int) -> ManagedObject:
         result.c8y = self.c8y
         return result
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """ Delete this object within the database.
 
         Note: child additions, assets (and devices) are not implicitly
@@ -443,7 +443,7 @@ def delete(self):
         """
         self._delete()
 
-    def delete_tree(self):
+    def delete_tree(self) -> None:
         """Delete this managed object within the database including child.
         additions, devices and assets.
         This is equivalent to using the `forceCascade` parameter of the
@@ -644,7 +644,7 @@ def reload(self) -> Device:
         """
         return self._reload(Device())
 
-    def delete(self, with_device_user=False):
+    def delete(self, with_device_user=False, **_) -> None:
         """Delete this device object within the database.
 
         Note: child additions, assets (and devices) are not implicitly
@@ -661,7 +661,7 @@ def delete(self, with_device_user=False):
         else:
             self._delete()
 
-    def delete_tree(self, with_device_user=False):
+    def delete_tree(self, with_device_user=False) -> None:
         """Delete this device object within the database including child.
         additions, devices and assets.
 
@@ -794,7 +794,7 @@ def update(self) -> DeviceGroup:
         """
         return super()._update()
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """Delete this device group.
 
         The child groups (if there are any) are left dangling. This is
@@ -803,7 +803,7 @@ def delete(self):
         """
         self._delete(cascade='false')
 
-    def delete_tree(self):
+    def delete_tree(self) -> None:
         """Delete this device group and its children.
 
         This is equivalent to using the `cascade=true` parameter in the

c8y_api/model/measurements.py

@@ -249,7 +249,7 @@ def update(self) -> Measurement:
         """Not implemented for Measurements."""
         raise NotImplementedError('Measurements cannot be updated within Cumulocity.')
 
-    def delete(self):
+    def delete(self, **_) -> None:
         """Delete the Measurement within the database."""
         self._delete()