Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Backport of d9b6fb8 from master
  • Loading branch information...
commit ef9133768c2aed52646ad0b6274edf836aa672b2 1 parent 2fb127b
@aaugustin aaugustin authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 django/utils/datetime_safe.py
View
7 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)
Please sign in to comment.
Something went wrong with that request. Please try again.