Fix tests

Author: scaramallion

libjpeg/tests/__init__.py

@@ -1,5 +1,9 @@
 
-from . import pydicom_handler as handler
+try:
+    from . import pydicom_handler as handler
+except ImportError:
+    pass
+
 
 def add_handler():
     """Add the pixel data handler to *pydicom*.

libjpeg/tests/test_decode.py

@@ -10,11 +10,12 @@
 try:
     import pydicom
     from pydicom.encaps import generate_pixel_data_frame
+    from . import handler
     HAS_PYDICOM = True
 except ImportError:
     HAS_PYDICOM = False
 
-from . import add_handler, remove_handler, handler
+from . import add_handler, remove_handler
 from libjpeg import decode
 from libjpeg.data import get_indexed_datasets, JPEG_DIRECTORY
 

libjpeg/tests/test_handler.py

@@ -10,11 +10,12 @@
     import pydicom.config
     from pydicom.pixel_data_handlers.util import convert_color_space
     from pydicom.encaps import defragment_data
+    from . import handler
     HAS_PYDICOM = True
 except ImportError:
     HAS_PYDICOM = False
 
-from . import add_handler, remove_handler, handler
+from . import add_handler, remove_handler
 from libjpeg import decode
 from libjpeg.data import get_indexed_datasets