Merge branch 'remove-implicit-relative-imports'

[pycomedi.git] / pycomedi / calibration.pxd

diff --git a/pycomedi/calibration.pxd b/pycomedi/calibration.pxd
index ca0b302d017a519a35c4d4a60721a1770126f90a..6e98b533cda9854eac26eff0201500eaaf75e660 100644 (file)
--- a/pycomedi/calibration.pxd
+++ b/pycomedi/calibration.pxd
@@ -16,13 +16,12 @@
 
 "Expose `CalibratedConverter` internals at the C level for other Cython modules"
 
-cimport _comedilib_h
-from device cimport Device as _Device
-from subdevice cimport Subdevice as _Subdevice
+from pycomedi cimport _comedilib_h
 
 
 cdef class CalibratedConverter (object):
     cdef _comedilib_h.comedi_polynomial_t _to_physical, _from_physical
+    cdef object _from_physical_error
 
     cdef _str_poly(self, _comedilib_h.comedi_polynomial_t polynomial)
     cpdef to_physical(self, data)
@@ -40,7 +39,7 @@ cdef class Caldac (object):
 
 cdef class CalibrationSetting (object):
     cdef _comedilib_h.comedi_calibration_setting_t *setting
-    cdef public _Subdevice subdevice
+    cdef public object subdevice  # pycomedi.subdevice.Subdevice
 
     cdef _caldacs_set_single(self, index, Caldac caldac)
     cpdef _soft_calibration_set(self, CalibratedConverter value)
@@ -48,6 +47,6 @@ cdef class CalibrationSetting (object):
 
 cdef class Calibration (object):
     cdef _comedilib_h.comedi_calibration_t *calibration
-    cdef public _Device device
+    cdef public object device  # pycomedi.device.Device
 
     cpdef from_file(self, path)