From 104303510b747ffa31b96e44465eb5fdbd016304 Mon Sep 17 00:00:00 2001 From: Guillaume Horel Date: Fri, 1 Jul 2016 16:08:17 -0400 Subject: more progress --- date.pyx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'date.pyx') 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(d.year, d.month, 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 -- cgit v1.2.3-70-g09d2