Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #21256 -- Error in datetime_safe.datetime.combine.

  • Loading branch information...
commit d9b6fb8f61e5029ce5d45d8fcb75694cee046b8f 1 parent 589dc49
@aaugustin aaugustin authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 django/utils/
7 django/utils/
@@ -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,, time.hour, time.minute, time.microsecond, time.tzinfo)
+ @classmethod
+ def combine(cls, date, time):
+ return cls(date.year, date.month,,
+ time.hour, time.minute, time.second,
+ time.microsecond, time.tzinfo)
def date(self):
return date(self.year, self.month,
Please sign in to comment.
Something went wrong with that request. Please try again.