Commit e692af82 authored by Tres Seaver's avatar Tres Seaver

Fix __repr__, __str__ for C timestamps.

parent a6adc499
...@@ -262,7 +262,11 @@ TimeStamp_raw(TimeStamp *self) ...@@ -262,7 +262,11 @@ TimeStamp_raw(TimeStamp *self)
static PyObject * static PyObject *
TimeStamp_repr(TimeStamp *self) TimeStamp_repr(TimeStamp *self)
{ {
return NATIVE_FROM_STRING_AND_SIZE((const char*)self->data, 8); PyObject *raw, *result;
raw = TimeStamp_raw(self);
result = PyObject_Repr(raw);
Py_DECREF(raw);
return result;
} }
static PyObject * static PyObject *
...@@ -277,7 +281,7 @@ TimeStamp_str(TimeStamp *self) ...@@ -277,7 +281,7 @@ TimeStamp_str(TimeStamp *self)
p.y, p.m, p.d, p.mi / 60, p.mi % 60, p.y, p.m, p.d, p.mi / 60, p.mi % 60,
TimeStamp_sec(self)); TimeStamp_sec(self));
return PyBytes_FromStringAndSize(buf, len); return NATIVE_FROM_STRING_AND_SIZE(buf, len);
} }
...@@ -462,7 +466,8 @@ TimeStamp_TimeStamp(PyObject *obj, PyObject *args) ...@@ -462,7 +466,8 @@ TimeStamp_TimeStamp(PyObject *obj, PyObject *args)
{ {
if (len != 8) if (len != 8)
{ {
PyErr_SetString(PyExc_ValueError, "8-character string expected"); PyErr_SetString(PyExc_ValueError,
"8-byte array expected");
return NULL; return NULL;
} }
return TimeStamp_FromString(buf); return TimeStamp_FromString(buf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment