Skip to content

Mixins for standard collections that implement collections.abc interfaces #1543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 23, 2021
Merged

Mixins for standard collections that implement collections.abc interfaces #1543

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5cb300a
added a few mixins to reflected .NET collection types, that implement…
lostmsu May 24, 2020
cd044c8
fixed MappingMixin implementation (untested)
lostmsu Jun 3, 2020
85897e3
fixed implementation of mixins for Mapping and MutableMapping (still …
lostmsu Jun 17, 2020
38ac73b
fixed mixin calls to TryGetValue
lostmsu Jun 17, 2020
b77b7ce
added a few tests for collection mixins
lostmsu Sep 5, 2021
a38849e
mentioned collection mixins in changelog
lostmsu Sep 5, 2021
6b20409
refactored LoadExtraModules for Mixins into LoadSubmodule + LoadMixins
lostmsu May 29, 2020
197689e
added a workaround for tp_clear implementations, that do not check, t…
lostmsu Sep 22, 2021
6ae373c
merge latest master
lostmsu Sep 23, 2021
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
Prev Previous commit
Next Next commit
fixed mixin calls to TryGetValue
  • Loading branch information
@lostmsu
lostmsu committed Sep 22, 2021
commit 38ac73b9e883b3f00fb7b51d20e8931566f00071
8 changes: 4 additions & 4 deletions src/runtime/Mixins/collections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ class MutableSequenceMixin(SequenceMixin, col.MutableSequence):
class MappingMixin(CollectionMixin, col.Mapping):
def __contains__(self, item): return self.ContainsKey(item)
def keys(self): return self.Keys
def items(self): return [(k,self[k]) for k in self.Keys]
def items(self): return [(k,self.get(k)) for k in self.Keys]
def values(self): return self.Values
def __iter__(self): return self.Keys.__iter__()
def get(self, key, default=None):
existed, item = self.TryGetValue(key)
existed, item = self.TryGetValue(key, None)
return item if existed else default

class MutableMappingMixin(MappingMixin, col.MutableMapping):
Expand All @@ -53,7 +53,7 @@ def clear(self):
self.Clear()

def pop(self, key, default=_UNSET_):
existed, item = self.TryGetValue(key)
existed, item = self.TryGetValue(key, None)
if existed:
self.Remove(key)
return item
Expand All @@ -63,7 +63,7 @@ def pop(self, key, default=_UNSET_):
return default

def setdefault(self, key, value=None):
existed, item = self.TryGetValue(key)
existed, item = self.TryGetValue(key, None)
if existed:
return item
else:
Expand Down