summaryrefslogtreecommitdiff
path: root/django/utils/datetime_safe.py
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:09:26 +0200
commitd9b6fb8f61e5029ce5d45d8fcb75694cee046b8f (patch)
tree79846b187ac8b3bc1f1bbbadfc9a642564f79e80 /django/utils/datetime_safe.py
parent589dc49e129f63801c54c15e408c944a345b3dfe (diff)
Fixed #21256 -- Error in datetime_safe.datetime.combine.
Diffstat (limited to 'django/utils/datetime_safe.py')
-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)