Skip to content
Browse files

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

Backport of d9b6fb8 from master
  • Loading branch information...
1 parent f0c7649 commit 5591fe6829c458346982e39e777f1fdca69e9792 @aaugustin aaugustin committed
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,

0 comments on commit 5591fe6

Please sign in to comment.
Something went wrong with that request. Please try again.