Skip to content

Commit 22b92e2

Browse files
committedApr 2, 2015
fixed matching logic
1 parent 141fbb8 commit 22b92e2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed
 

‎tia/rlab/table.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def check_and_append(*args, **kwargs):
6868
MillionDollarsFormatter = pad_positive_wrapper(fmt.new_millions_formatter(prefix='$', nan='-'))
6969
BillionDollarsFormatter = pad_positive_wrapper(fmt.new_billions_formatter(prefix='$', nan='-'))
7070
YmdFormatter = fmt.new_datetime_formatter('%Y%m%d', True)
71-
Y_m_dFormatter = fmt.new_datetime_formatter('%Y_%m_%d', True)
71+
Y_m_dFormatter = fmt.new_datetime_formatter('%Y-%m-%d', True)
7272
mdYFormatter = fmt.new_datetime_formatter('%m/%d/%Y', True)
7373

7474

@@ -95,7 +95,11 @@ def find_locations(index, match_value_or_fct, levels=None, max_matches=0):
9595
matches = []
9696
fct = match_value_or_fct
9797
if not callable(fct):
98-
fct = lambda v: v == match_value_or_fct
98+
match_value = match_value_or_fct
99+
if not isinstance(match_value, basestring) and hasattr(match_value, '__iter__'):
100+
fct = lambda v: v in match_value
101+
else:
102+
fct = lambda v: v == match_value_or_fct
99103

100104
for lvl, loc, val in level_iter(index, levels):
101105
if fct(val):

0 commit comments

Comments
 (0)
Please sign in to comment.