Skip to content
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

Jump to bottom

Be more conservative of casting text that contains dates to date and datetimes #705

Merged
merged 2 commits into from Dec 11, 2017
Merged

Be more conservative of casting text that contains dates to date and datetimes #705

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
db602be
text fields innapropriately cast to date and datetime
fgregg Dec 8, 2017
259ae2e
make sure that pytimeparse uses entire field
fgregg Dec 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions agate/data_types/date.py
View file
Open in desktop
Expand Up @@ -72,10 +72,13 @@ def cast(self, d):

return dt.date()

value, ctx = self.parser.parseDT(d, sourceTime=ZERO_DT)

if ctx.hasDate and not ctx.hasTime:
return value.date()
try:
(value, ctx, _, _, matched_text), = self.parser.nlp(d, sourceTime=ZERO_DT)
except (TypeError, ValueError):
raise CastError('Value "%s" does not match date format.' % d)
else:
if matched_text == d and ctx.hasDate and not ctx.hasTime:
return value.date()

raise CastError('Can not parse value "%s" as date.' % d)

Expand Down
25 changes: 15 additions & 10 deletions agate/data_types/date_time.py
View file
Open in desktop
Expand Up @@ -78,16 +78,21 @@ def cast(self, d):
except:
raise CastError('Value "%s" does not match date format.' % d)

value, ctx = self._parser.parseDT(
d,
sourceTime=self._source_time,
tzinfo=self.timezone
)

if ctx.hasDate and ctx.hasTime:
return value
elif ctx.hasDate and not ctx.hasTime:
return datetime.datetime.combine(value.date(), datetime.time.min)
try:
(_, _, _, _, matched_text), = self._parser.nlp(d, sourceTime=self._source_time)
except:
matched_text = None
else:
value, ctx = self._parser.parseDT(
d,
sourceTime=self._source_time,
tzinfo=self.timezone
)

if matched_text == d and ctx.hasDate and ctx.hasTime:
return value
elif matched_text == d and ctx.hasDate and not ctx.hasTime:
return datetime.datetime.combine(value.date(), datetime.time.min)

try:
dt = isodate.parse_datetime(d)
Expand Down
3 changes: 3 additions & 0 deletions tests/test_data_types.py
View file
Open in desktop
Expand Up @@ -207,6 +207,8 @@ def test_test(self):
self.assertEqual(self.type.test('2016-12-29T11:43:30Z'), False)
self.assertEqual(self.type.test('2016-12-29T11:43:30+06:00'), False)
self.assertEqual(self.type.test('2016-12-29T11:43:30-06:00'), False)
self.assertEqual(self.type.test('MC 5.7.10 Per Dorothy Carroll'), False)
self.assertEqual(self.type.test('testing workgroup fix - 4/7/2010 - Marcy Liberty'), False)

def test_test_format(self):
date_type = Date(date_format='%m-%d-%Y')
Expand Down Expand Up @@ -285,6 +287,7 @@ def test_test(self):
self.assertEqual(self.type.test('2016-12-29T11:43:30Z'), True)
self.assertEqual(self.type.test('2016-12-29T11:43:30+06:00'), True)
self.assertEqual(self.type.test('2016-12-29T11:43:30-06:00'), True)
self.assertEqual(self.type.test('720(38-4)31A-1.1(A)'), False)

def test_test_format(self):
datetime_type = DateTime(datetime_format='%m-%d-%Y %I:%M %p')
Expand Down