Always have a real QDate object in QYDateEdit

agateau · Sep 26, 2011 · fa62a4f · fa62a4f
1 parent 6940ec8
commit fa62a4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/qydateedit.py b/qydateedit.py
@@ -36,7 +36,7 @@ def __init__(self, parent=None):
         layout.addWidget(self._resetButton)
         layout.addStretch()
 
-        self._date = None
+        self._date = QDate()
 
         QObject.connect(self._lineEdit, SIGNAL("textEdited(QString)"), self.slotTextEdited)
         QObject.connect(self._resetButton, SIGNAL("clicked()"), self.resetDate)
@@ -48,7 +48,7 @@ def _updateResetButton(self):
         self._resetButton.setEnabled(not self._lineEdit.text().isEmpty())
 
     def _updateLineEdit(self):
-        if self._date is None:
+        if self._date.isNull():
             self._lineEdit.setText(QString())
         else:
             self._lineEdit.setText(self._date.toString(Qt.SystemLocaleShortDate))
@@ -62,7 +62,7 @@ def date(self):
         return self._date
 
     def resetDate(self):
-        self.setDate(None)
+        self.setDate(QDate())
         self.emitDateChanged()
 
     def slotTextEdited(self, text):

diff --git a/qydateutils.py b/qydateutils.py
@@ -3,9 +3,11 @@
 from datetime import datetime
 
 def datetimeFromQDate(qdate):
-    if qdate is None:
+    if qdate is None or qdate.isNull():
         return None
     return datetime(qdate.year(), qdate.month(), qdate.day())
 
 def qdateFromDatetime(dt):
+    if dt is None:
+        return QDate()
     return QDate(dt.year, dt.month, dt.day)