From cde1377257b9c87e941002135e43eefea1366c80 Mon Sep 17 00:00:00 2001 From: Jace Browning Date: Mon, 9 May 2016 16:01:58 -0400 Subject: [PATCH] Rename 'find_all' to 'match' --- tests/test_imports.py | 2 +- yorm/__init__.py | 2 +- yorm/test/test_utilities.py | 4 ++-- yorm/utilities.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_imports.py b/tests/test_imports.py index aa33dae..7baeba4 100644 --- a/tests/test_imports.py +++ b/tests/test_imports.py @@ -28,7 +28,7 @@ def test_from_top_decorators(): def test_from_top_utilities(): from yorm import create from yorm import find - from yorm import find_all + from yorm import match from yorm import load from yorm import save from yorm import delete diff --git a/yorm/__init__.py b/yorm/__init__.py index c15e6bd..e00cfc3 100644 --- a/yorm/__init__.py +++ b/yorm/__init__.py @@ -17,7 +17,7 @@ from . import bases, types from .common import UUID from .decorators import sync, sync_object, sync_instances, attr - from .utilities import create, find, find_all, load, save, delete + from .utilities import create, find, match, load, save, delete from .bases import Container, Converter, Mappable, Convertible except ImportError: # pragma: no cover (manual test) pass diff --git a/yorm/test/test_utilities.py b/yorm/test/test_utilities.py index 7a8dbaa..48d7e92 100644 --- a/yorm/test/test_utilities.py +++ b/yorm/test/test_utilities.py @@ -83,11 +83,11 @@ def it_requires_a_mapped_class_or_instance(): utilities.find(Mock) -def describe_find_all(): +def describe_match(): def it_is_not_yet_implemented(): with expect.raises(NotImplementedError): - utilities.find_all(Mock) + utilities.match(Mock) def describe_load(): diff --git a/yorm/utilities.py b/yorm/utilities.py index a9fb435..7d550c8 100644 --- a/yorm/utilities.py +++ b/yorm/utilities.py @@ -38,8 +38,8 @@ def find(class_or_instance, *args, create=False): # pylint: disable=redefined-o return None -def find_all(cls, **kwargs): - """Return a list of all matching mapped objects.""" +def match(cls, **kwargs): + """Yield all matching mapped objects.""" log.debug((cls, kwargs)) raise NotImplementedError