Use Astropy by default if possible

This commit is contained in:
Thomas Robitaille
2013-11-24 22:23:49 +01:00
parent db3d04da82
commit 9ecbc6ef58
2 changed files with 14 additions and 7 deletions
+7 -4
View File
@@ -3,11 +3,14 @@ __all__ = ['imread', 'imread_collection']
import skimage.io as io
try:
import pyfits
from astropy.io import fits as pyfits
except ImportError:
raise ImportError("PyFITS could not be found. Please refer to\n"
"http://www.stsci.edu/resources/software_hardware/pyfits\n"
"for further instructions.")
try:
import pyfits
except ImportError:
raise ImportError("PyFITS could not be found. Please refer to\n"
"http://www.stsci.edu/resources/software_hardware/pyfits\n"
"for further instructions.")
def imread(fname, dtype=None):
+7 -3
View File
@@ -9,10 +9,14 @@ from skimage import data_dir
pyfits_available = True
try:
import pyfits
from astropy.io import fits as pyfits
except ImportError:
pyfits_available = False
else:
try:
import pyfits
except ImportError:
pyfits_available = False
if pyfits_available:
import skimage.io._plugins.fits_plugin as fplug