Commit ea04c81d authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[1.4.x] Fixed #21256 -- Error in datetime_safe.datetime.combine. 

Backport of d9b6fb8f from master
parent 037ec105

django/utils/datetime_safe.py

+5 −2
Original line number Diff line number Diff line
@@ -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)