Merge branch 'remove-implicit-relative-imports'

[pycomedi.git] / pycomedi / _error.pyx

diff --git a/pycomedi/_error.pyx b/pycomedi/_error.pyx
index 15332573e3db5b846be128456c5a6a16eecc0f65..f222ffb41cea5bf022f873f51f3486c2e1498bdf 100644 (file)
--- a/pycomedi/_error.pyx
+++ b/pycomedi/_error.pyx
@@ -16,12 +16,10 @@
 
 "Useful error checking wrappers around Comedilib function calls"
 
-# No relative imports in Cython yet, see
-#   http://trac.cython.org/cython_trac/ticket/542
-from pycomedi import LOG as _LOG
-from pycomedi import PyComediError as _PyComediError
+from . import LOG as _LOG
+from . import PyComediError as _PyComediError
 
-cimport _comedilib_h
+from pycomedi cimport _comedilib_h
 
 
 def raise_error(function_name=None, ret=None, error_msg=None):
@@ -38,7 +36,7 @@ def raise_error(function_name=None, ret=None, error_msg=None):
     PyComediError: myfn (some error): Success (-1)
     >>> try:
     ...     raise_error(function_name='myfn', ret=-1)
-    ... except PyComediError, e:
+    ... except PyComediError as e:
     ...     print(e.function_name)
     ...     print(e.ret)
     myfn