wassname/catalyst
1
0
Fork 0
mirror of https://github.com/wassname/catalyst.git synced 2026-09-12 12:12:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1734 from quantopian/prepare-for-validity-checks

Browse Source 
MAINT: Prepare parameter check for adding an additional check.
This commit is contained in:
Eddie Hebert
2017-03-30 14:02:03 -04:00
committed by GitHub
parent 0182d62cc8 fc65ac33ca
commit 84b24d2cee
1 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zipline/_protocol.pyx
+6 -14
View File
@@ -82,16 +82,12 @@ cdef class check_parameters(object):
for i, arg in enumerate(args[1:]): for i, arg in enumerate(args[1:]):
expected_type = self.types[i] expected_type = self.types[i]
if isinstance(arg, expected_type): if (i == 0 or i == 1) and _is_iterable(arg):
continue
elif (i == 0 or i == 1) and _is_iterable(arg):
if len(arg) == 0: if len(arg) == 0:
continue continue
arg = arg[0]
if isinstance(arg[0], expected_type): if not isinstance(arg, expected_type):
continue
expected_type_name = expected_type.__name__ \ expected_type_name = expected_type.__name__ \
if not _is_iterable(expected_type) \ if not _is_iterable(expected_type) \
else ', '.join([type_.__name__ for type_ in expected_type]) else ', '.join([type_.__name__ for type_ in expected_type])
@@ -104,15 +100,11 @@ cdef class check_parameters(object):
# verify type of each kwarg # verify type of each kwarg
for keyword, arg in iteritems(kwargs): for keyword, arg in iteritems(kwargs):
if isinstance(arg, self.keys_to_types[keyword]): if keyword in ('assets', 'fields') and _is_iterable(arg):
continue
elif keyword in ('assets', 'fields') and _is_iterable(arg):
if len(arg) == 0: if len(arg) == 0:
continue continue
arg = arg[0]
if isinstance(arg[0], self.keys_to_types[keyword]): if not isinstance(arg, self.keys_to_types[keyword]):
continue
expected_type = self.keys_to_types[keyword].__name__ \ expected_type = self.keys_to_types[keyword].__name__ \
if not _is_iterable(self.keys_to_types[keyword]) \ if not _is_iterable(self.keys_to_types[keyword]) \
else ', '.join([type_.__name__ for type_ in else ', '.join([type_.__name__ for type_ in