From 05578c8745cf767950c7bb14f0a48c0b76e9116e Mon Sep 17 00:00:00 2001 From: Aleksandar Jovanov Date: Wed, 28 Jun 2017 10:10:23 +0200 Subject: [PATCH] [#2228] Use regexp to replace year --- ckan/lib/helpers.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index 77758d12cc6..40d12c77ea5 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -1179,12 +1179,16 @@ def render_datetime(datetime_, date_format=None, with_hours=False): # See http://bugs.python.org/issue1777412 if datetime_.year < 1900: - date_format = date_format.replace('%y', str(datetime_.year)[-2:]) - date_format = date_format.replace('%Y', str(datetime_.year)) + year = str(datetime_.year) - # "2017" can be any year, since it will be replaced with the one - # provided in "date_format" - datetime_ = datetime.datetime(2017, datetime_.month, datetime_.day, + date_format = re.sub('(?{year}'.format(year=year[-2:]), + date_format) + date_format = re.sub('(?{year}'.format(year=year), + date_format) + + datetime_ = datetime.datetime(2016, datetime_.month, datetime_.day, datetime_.hour, datetime_.minute, datetime_.second)