Another exception handled while converting something into a datetime

Author: Matthias Ludwig

pandasqt/models/DataFrameModel.py

@@ -350,8 +350,8 @@ def setData(self, index, value, role=Qt.DisplayRole):
                     value = value.toString(self.timestampFormat)
                 try:
                     value = pandas.Timestamp(value)
-                except ValueError, e:
-                    raise
+                except Exception:
+                    raise Exception, u"Can't convert '{0}' into a datetime".format(value)
                     return False
             else:
                 raise TypeError, "try to set unhandled data type"

tests/test_DataFrameModel.py

@@ -414,7 +414,9 @@ def test_date(self, model, index):
         assert model.data(index, role=DATAFRAME_ROLE) == newDate
         assert isinstance(model.data(index, role=DATAFRAME_ROLE), pandas.Timestamp)
 
-        assert model.setData(index, 'foobar') == False
+        with pytest.raises(Exception) as err:
+            model.setData(index, 'foobar')
+        assert "Can't convert 'foobar' into a datetime" in str(err.value)
 
     @pytest.mark.parametrize(
         "value, dtype, precision", [
@@ -604,7 +606,7 @@ def test_add_column(self, model, newColumns):
             if isinstance(_type, numpy.dtype):
                 defaultVal = _type.type()
                 if _type.type == numpy.datetime64:
-                    defaultVal = pandas.Timestamp('')
+                    defaultVal = pandas.Timestamp('1-01-01 00:00:00')
             else:
                 defaultVal = _type()