This commit is contained in:
Kovid Goyal 2014-11-17 09:37:10 +05:30
parent 77504c31a0
commit 48ecd9b516

View File

@ -8,7 +8,7 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import textwrap, re, os, shutil, weakref import textwrap, re, os, shutil, weakref
from datetime import date from datetime import date, datetime
from PyQt5.Qt import ( from PyQt5.Qt import (
Qt, QDateTimeEdit, pyqtSignal, QMessageBox, QIcon, QToolButton, QWidget, Qt, QDateTimeEdit, pyqtSignal, QMessageBox, QIcon, QToolButton, QWidget,
@ -120,7 +120,7 @@ def make_undoable(spinbox):
self.undo_val = widget.dateTime() self.undo_val = widget.dateTime()
elif hasattr(widget, 'value'): elif hasattr(widget, 'value'):
self.undo_val = widget.value() self.undo_val = widget.value()
if isinstance(val, date): if isinstance(val, date) and not isinstance(val, datetime):
val = parse_only_date(val.isoformat(), assume_utc=False, as_utc=False) val = parse_only_date(val.isoformat(), assume_utc=False, as_utc=False)
self.redo_val = val self.redo_val = val
@ -172,7 +172,7 @@ def make_undoable(spinbox):
else: else:
self.undo_stack.clear() self.undo_stack.clear()
if hasattr(self, 'setDateTime'): if hasattr(self, 'setDateTime'):
if isinstance(val, date) and not is_date_undefined(val): if isinstance(val, date) and not isinstance(val, datetime) and not is_date_undefined(val):
val = parse_only_date(val.isoformat(), assume_utc=False, as_utc=False) val = parse_only_date(val.isoformat(), assume_utc=False, as_utc=False)
self.setDateTime(val) self.setDateTime(val)
elif hasattr(self, 'setValue'): elif hasattr(self, 'setValue'):