better way to set up enum

Author: thrasibule

quantlib/time/calendars/_jointcalendar.pxd

@@ -1,15 +1,7 @@
 from libcpp.string cimport string
 
 from quantlib.time._calendar cimport Calendar
-
-
-cdef extern from 'ql/time/calendars/jointcalendar.hpp' namespace 'QuantLib' nogil:
-
-    cdef enum JointCalendarRule:
-        JoinHolidays    # A date is a holiday for the joint calendar
-                        # if it is a holiday for any of the given calendars
-        JoinBusinessDays # A date is a business day for the joint calendar
-                         # if it is a business day for any of the given calendars
+from .jointcalendar cimport JointCalendarRule
 
 cdef extern from 'ql/time/calendars/jointcalendar.hpp' namespace 'QuantLib' nogil:
     cdef cppclass JointCalendar(Calendar):

quantlib/time/calendars/jointcalendar.pxd

@@ -1,5 +1,13 @@
 from quantlib.time.calendar cimport Calendar
 
+cdef extern from 'ql/time/calendars/jointcalendar.hpp' namespace 'QuantLib' nogil:
+
+    cpdef enum JointCalendarRule:
+        JoinHolidays    # A date is a holiday for the joint calendar
+                        # if it is a holiday for any of the given calendars
+        JoinBusinessDays # A date is a business day for the joint calendar
+                         # if it is a business day for any of the given calendars
+
 cdef class JointCalendar(Calendar):
     pass
 

quantlib/time/calendars/jointcalendar.pyx

@@ -4,10 +4,6 @@ cimport quantlib.time.calendars._jointcalendar as _jc
 cimport quantlib.time._calendar as _cal
 from quantlib.time.calendar cimport Calendar
 
-cpdef enum JointCalendarRule:
-    JOINHOLIDAYS = _jc.JoinHolidays
-    JOINBUSINESSDAYS = _jc.JoinBusinessDays
-
 cdef class JointCalendar(Calendar):
     '''
     Joint calendar
@@ -17,7 +13,7 @@ cdef class JointCalendar(Calendar):
     '''
 
     @cython.cpp_locals(True)
-    def __cinit__(self, Calendar c1, Calendar c2, int jc = JOINHOLIDAYS):
+    def __cinit__(self, Calendar c1, Calendar c2, JointCalendarRule jc = JointCalendarRule.JoinHolidays):
         self._thisptr = _jc.JointCalendar(c1._thisptr,
                                           c2._thisptr,
-                                          <_jc.JointCalendarRule> jc)
+                                          jc)