more progress

1 files changed, 8 insertions, 6 deletions

diff --git a/date.pyx b/date.pyx
index 26d7339..81a66f3 100644
--- a/date.pyx
+++ b/date.pyx
@@ -1,16 +1,18 @@
 import datetime
+from cpython cimport datetime as c_datetime
 from date cimport JpmcdsDate, JpmcdsStringToDayCountConv
 
-cdef TDate pydate_to_TDate(d):
-    assert isinstance(d, datetime.date)
-    return JpmcdsDate(d.year, d.month, d.day)
+c_datetime.import_datetime()
 
-cpdef object TDate_to_pydate(TDate d):
+cdef TDate pydate_to_TDate(c_datetime.date d):
+    return JpmcdsDate(<long>d.year, <long>d.month, <long>d.day)
+
+cpdef c_datetime.date TDate_to_pydate(TDate d):
     cdef TMonthDayYear date
     if JpmcdsDateToMDY(d, &date) == 0:
-        return datetime.date(date.year, date.month, date.day)
+        return c_datetime.date_new(date.year, date.month, date.day)
 
-cdef long dcc(str day_count):
+cdef long dcc(str day_count) except -1:
     cdef long r
     dc_bytes = day_count.encode('utf-8')
     cdef char* dc = dc_bytes