diff options
Diffstat (limited to 'django/utils/datetime_safe.py')
| -rw-r--r-- | django/utils/datetime_safe.py | 7 |
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) |