Skip to content

Commit 6f28b84

Browse files
fix: fix id_or_name property of key class (#115)
* fix: fix id_or_name property of key class * fix: unit test added
1 parent 5851522 commit 6f28b84

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

google/cloud/datastore/key.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,9 @@ def id_or_name(self):
441441
:returns: The last element of the key's path if it is either an ``id``
442442
or a ``name``.
443443
"""
444-
return self.id or self.name
444+
if self.id is None:
445+
return self.name
446+
return self.id
445447

446448
@property
447449
def project(self):

tests/unit/test_key.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,11 @@ def test_id_or_name_w_name_only(self):
488488
key = self._make_one("KIND", _NAME, project=self._DEFAULT_PROJECT)
489489
self.assertEqual(key.id_or_name, _NAME)
490490

491+
def test_id_or_name_w_id_zero(self):
492+
_ID = 0
493+
key = self._make_one("KIND", _ID, project=self._DEFAULT_PROJECT)
494+
self.assertEqual(key.id_or_name, _ID)
495+
491496
def test_parent_default(self):
492497
key = self._make_one("KIND", project=self._DEFAULT_PROJECT)
493498
self.assertIsNone(key.parent)

0 commit comments

Comments
 (0)