Skip to content

Commit

Permalink
Merge pull request #269 from rhelmer/bug715343-cron-broken-date
Browse files Browse the repository at this point in the history
fixes bug 715343 - most of the existing cron jobs start scripts do not overrid...
  • Loading branch information
rhelmer committed Jan 8, 2012
2 parents 8bf3189 + 81d8586 commit 43fdc8e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions socorro/lib/datetimeutil.py
Expand Up @@ -64,6 +64,8 @@ def string_to_datetime(date):
* ['2012-01-10', '12:13:14']
"""
if date is None:
return None
if isinstance(date, datetime.datetime):
if not date.tzinfo:
date = date.replace(tzinfo=UTC)
Expand Down

0 comments on commit 43fdc8e

Please sign in to comment.