Skip to content
This repository was archived by the owner on Mar 6, 2026. It is now read-only.

Key property fix #242

Closed
epluntze wants to merge 2 commits into from
Closed

Key property fix #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2316056
Fix for Key property not working correctly with a string Kind
epluntze Nov 14, 2019
bfcff23
Remove if; dont pass
epluntze Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions google/cloud/ndb/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3284,10 +3284,6 @@ def __init__(
temp = kind
kind = name
name = temp
if isinstance(kind, six.string_types) and name is None:
temp = kind
kind = name
name = temp
if isinstance(name, type) and kind is None:
temp = kind
kind = name
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2405,13 +2405,13 @@ class Simple(model.Model):
assert prop._name is None
assert prop._kind is None

name_only_args = [("keyp",), (None, "keyp"), ("keyp", None)]
name_only_args = [("keyp",), ("keyp", None)]
for args in name_only_args:
prop = model.KeyProperty(*args)
assert prop._name == "keyp"
assert prop._kind is None

kind_only_args = [(Simple,), (None, Simple), (Simple, None)]
kind_only_args = [(Simple,), (None, "Simple"), (None, Simple), (Simple, None)]
for args in kind_only_args:
prop = model.KeyProperty(*args)
assert prop._name is None
Expand Down