Skip to content

Commit bbd17c5

Browse files
committed
Improved code and tests.
1 parent 1b53e15 commit bbd17c5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

c8y_api/model/_base.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,7 @@ def get(self, path: str, default=None):
420420
continue
421421
if hasattr(value, segment):
422422
return value.__getattribute__(segment)
423-
else:
424-
return default
423+
return default
425424
return value
426425

427426
@deprecated
@@ -497,7 +496,6 @@ def build_object_path(self, object_id: int | str) -> str:
497496
"""
498497
return self.resource + '/' + str(object_id)
499498

500-
501499
@staticmethod
502500
def _map_params(
503501
q=None,

tests/model/test_base.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ def test_complexobject_instantiation_and_formatting():
233233

234234

235235
def test_complexobject_get():
236+
"""Verify that get by path works as expected."""
236237

237238
obj = ComplexTestObject(
238239
field='field value',
@@ -247,6 +248,8 @@ def test_complexobject_get():
247248
assert obj.get('c8y_complex.a') == obj.c8y_complex.a
248249
assert obj.get('not') is None
249250
assert obj.get('not', 'default') == 'default'
251+
assert obj.get('c8y_complex.not') is None
252+
assert obj.get('c8y_complex.not', 'default') == 'default'
250253

251254

252255
@pytest.mark.parametrize('page_size, num_all, limit, expected', [

0 commit comments

Comments
 (0)