diff --git a/src/cpl_query/__init__.py b/src/cpl_query/__init__.py index c3c0020a..f35af1d7 100644 --- a/src/cpl_query/__init__.py +++ b/src/cpl_query/__init__.py @@ -15,11 +15,11 @@ __title__ = 'cpl_query' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.11.0.post2' +__version__ = '2021.11.0.post3' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='11', micro='0.post2') +version_info = VersionInfo(major='2021', minor='11', micro='0.post3') diff --git a/src/cpl_query/_query/__init__.py b/src/cpl_query/_query/__init__.py index dbdb0c88..341c50f0 100644 --- a/src/cpl_query/_query/__init__.py +++ b/src/cpl_query/_query/__init__.py @@ -15,11 +15,11 @@ __title__ = 'cpl_query._query' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.11.0.post2' +__version__ = '2021.11.0.post3' from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='11', micro='0.post2') +version_info = VersionInfo(major='2021', minor='11', micro='0.post3') diff --git a/src/cpl_query/_query/where.py b/src/cpl_query/_query/where.py index 94d555fe..81020f75 100644 --- a/src/cpl_query/_query/where.py +++ b/src/cpl_query/_query/where.py @@ -11,7 +11,7 @@ def where_query(_list: IterableABC, _func: Callable) -> IterableABC: if _func is None: raise ArgumentNoneException(ExceptionArgument.func) - result = IterableABC() + result = IterableABC(_list.type) for element in _list: if _func(element): result.append(element) diff --git a/src/cpl_query/cpl_query.json b/src/cpl_query/cpl_query.json index 3484e395..a8aa8239 100644 --- a/src/cpl_query/cpl_query.json +++ b/src/cpl_query/cpl_query.json @@ -4,7 +4,7 @@ "Version": { "Major": "2021", "Minor": "11", - "Micro": "0.post2" + "Micro": "0.post3" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_query/extension/__init__.py b/src/cpl_query/extension/__init__.py index f09b1bb5..ea93d326 100644 --- a/src/cpl_query/extension/__init__.py +++ b/src/cpl_query/extension/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_query.extension' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de' -__version__ = '2021.11.0.post2' +__version__ = '2021.11.0.post3' from collections import namedtuple @@ -27,4 +27,4 @@ from .ordered_iterable_abc import OrderedIterableABC from .ordered_iterable import OrderedIterable VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2021', minor='11', micro='0.post2') +version_info = VersionInfo(major='2021', minor='11', micro='0.post3') diff --git a/src/cpl_query/extension/iterable.py b/src/cpl_query/extension/iterable.py index 07049122..ff835382 100644 --- a/src/cpl_query/extension/iterable.py +++ b/src/cpl_query/extension/iterable.py @@ -43,7 +43,7 @@ class Iterable(IterableABC): def count(self, func: Callable = None) -> int: return count_query(self, func) - def distinct(self, func: Callable) -> IterableABC: + def distinct(self, func: Callable = None) -> IterableABC: return self.__to_self(distinct_query(self, func)) def element_at(self, index: int) -> any: diff --git a/src/cpl_query/extension/iterable_abc.py b/src/cpl_query/extension/iterable_abc.py index 24a4a13f..45135c6e 100644 --- a/src/cpl_query/extension/iterable_abc.py +++ b/src/cpl_query/extension/iterable_abc.py @@ -60,9 +60,8 @@ class IterableABC(ABC, list): __object: :class:`object` value """ - if self._type is not None and type(__object) != self._type and not isinstance(type(__object), self._type) \ - and not issubclass(type(__object), self._type): - raise Exception(f'Unexpected type: {type(__object)}') + if self._type is not None and type(__object) != self._type and not isinstance(type(__object), self._type) and not issubclass(type(__object), self._type): + raise Exception(f'Unexpected type: {type(__object)}\nExpected type: {self._type}') if len(self) == 0 and self._type is None: self._type = type(__object)