Skip to content

[FIX] Select Rows: skip undefined TimeVariable filters #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astaric merged 2 commits into from
Jul 8, 2016
Merged

[FIX] Select Rows: skip undefined TimeVariable filters #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6876d42
owselectrows: Parse time strings after skipping empty values
lanzagar Jul 8, 2016
64a9eab
TimeVariable: Print the invalid format in error message
lanzagar Jul 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Orange/data/variable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,8 @@ def parse(self, datestr):
return Unknown
datestr = datestr.strip().rstrip('Z')

ERROR = ValueError('Invalid datetime format. Only ISO 8601 supported.')
ERROR = ValueError("Invalid datetime format '{}'. "
"Only ISO 8601 supported.".format(datestr))
if not self._matches_iso_format(datestr):
try:
# If it is a number, assume it is a unix timestamp
Expand Down
17 changes: 9 additions & 8 deletions Orange/widgets/data/owselectrows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,17 +352,18 @@ def commit(self):
attr_index = domain.index(attr_name)
attr = domain[attr_index]

# Parse datetime strings into floats
if isinstance(attr, TimeVariable):
try:
values = [attr.parse(v) for v in values]
except ValueError as e:
self.error(21, e.args[0])
return

if attr.is_continuous:
if any(not v for v in values):
continue

# Parse datetime strings into floats
if isinstance(attr, TimeVariable):
try:
values = [attr.parse(v) for v in values]
except ValueError as e:
self.error(21, e.args[0])
return

filter = data_filter.FilterContinuous(
attr_index, oper, *[float(v) for v in values])
elif attr.is_string:
Expand Down