Skip to content

common: Fix client time parser #36

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

Closed
wants to merge 1 commit into from
Closed

common: Fix client time parser #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion tryton/tryton/common/datetime_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# this repository contains the full copyright notices and license terms.
import datetime
import gettext
import re

from dateutil.parser import parse
from dateutil.relativedelta import relativedelta
Expand Down Expand Up @@ -58,7 +59,10 @@ def date_parse(text, format_='%x'):
monthfirst = False
yearfirst = not dayfirst and not monthfirst
if len(text) == 8 and dayfirst:
return datetime.datetime.strptime(text, '%d%m%Y')
if re.match(r"\d{8}", text):
return datetime.datetime.strptime(text, '%d%m%Y')
elif re.match(r"\d{6}", text):
return datetime.datetime.strptime(text, '%d%m%y')
return parse(text, dayfirst=dayfirst, yearfirst=yearfirst, ignoretz=True)


Expand Down