summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-10-13 19:09:26 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-10-13 19:11:43 +0200
commit5591fe6829c458346982e39e777f1fdca69e9792 (patch)
tree5f0df351e9c93c6102d5487a68cbfc37c7470722
parentf0c7649b1692f8441eb9b9b923b2bed8e95f9185 (diff)
[1.6.x] Fixed #21256 -- Error in datetime_safe.datetime.combine.
Backport of d9b6fb8 from master
-rw-r--r--django/utils/datetime_safe.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/django/utils/datetime_safe.py b/django/utils/datetime_safe.py
index b634888092..ca96fb37b0 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)