Skip to content

Commit

Permalink
Remove call to data.items() from the validate() function--this
Browse files Browse the repository at this point in the history
is redundant because the helper functions already do this.
  • Loading branch information
shawnbrown committed Nov 28, 2018
1 parent d0d2887 commit 7aa612e
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions datatest/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,20 +383,18 @@ def iseven(x): # <- Predicate function
__tracebackhide__ = lambda excinfo: excinfo.errisinstance(ValidationError)

data = _normalize_data(data)
if isinstance(data, Mapping):
data = getattr(data, 'iteritems', data.items)()
requirement = _normalize_requirement(requirement)

if isinstance(requirement, Mapping):
result = _datadict_vs_requirementdict(data, requirement)
elif _is_collection_of_items(data):
elif isinstance(data, Mapping) or _is_collection_of_items(data):
result = _datadict_vs_requirement(data, requirement)
else:
result = _data_vs_requirement(data, requirement)

if result:
differences, description = result
if isinstance(differences, dict):
if isinstance(differences, Mapping):
for k, v in differences.items():
if isinstance(v, Iterator):
differences[k] = list(v)
Expand Down

0 comments on commit 7aa612e

Please sign in to comment.