From ef9133768c2aed52646ad0b6274edf836aa672b2 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Oct 2013 19:09:26 +0200 Subject: [PATCH] [1.5.x] Fixed #21256 -- Error in datetime_safe.datetime.combine. Backport of d9b6fb8 from master --- django/utils/datetime_safe.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/django/utils/datetime_safe.py b/django/utils/datetime_safe.py index b634888092f..ca96fb37b04 100644 --- a/django/utils/datetime_safe.py +++ b/django/utils/datetime_safe.py @@ -19,8 +19,11 @@ class datetime(real_datetime): def strftime(self, fmt): return strftime(self, fmt) - def combine(self, date, time): - return datetime(date.year, date.month, date.day, time.hour, time.minute, time.microsecond, time.tzinfo) + @classmethod + def combine(cls, date, time): + return cls(date.year, date.month, date.day, + time.hour, time.minute, time.second, + time.microsecond, time.tzinfo) def date(self): return date(self.year, self.month, self.day)