8 files changed, 22 insertions, 15 deletions
diff --git a/lib/stwcs/wcsutil/altwcs.py b/lib/stwcs/wcsutil/altwcs.py
index ad17a11..9dd7edb 100644
--- a/lib/stwcs/wcsutil/altwcs.py
+++ b/lib/stwcs/wcsutil/altwcs.py
@@ -3,8 +3,10 @@ import os
 import string
 
 import numpy as np
-import pywcs
-import pyfits
+#import pywcs
+from astropy import wcs as pywcs
+from astropy.io import fits as pyfits
+#import pyfits
 from stsci.tools import fileutil as fu
 
 altwcskw = ['WCSAXES', 'CRVAL', 'CRPIX', 'PC', 'CDELT', 'CD', 'CTYPE', 'CUNIT',
diff --git a/lib/stwcs/wcsutil/convertwcs.py b/lib/stwcs/wcsutil/convertwcs.py
index 0fa61af..6f9f0bf 100644
--- a/lib/stwcs/wcsutil/convertwcs.py
+++ b/lib/stwcs/wcsutil/convertwcs.py
@@ -1,4 +1,5 @@
-import pyfits
+from astropy.io import fits as pyfits
+
 try:
     import stwcs
     from stwcs import wcsutil
diff --git a/lib/stwcs/wcsutil/getinput.py b/lib/stwcs/wcsutil/getinput.py
index bfe4234..b5a5df7 100644
--- a/lib/stwcs/wcsutil/getinput.py
+++ b/lib/stwcs/wcsutil/getinput.py
@@ -1,4 +1,4 @@
-import pyfits
+from astropy.io import fits as pyfits
 from stsci.tools import irafglob, fileutil, parseinput
 
 def parseSingleInput(f=None, ext=None):
diff --git a/lib/stwcs/wcsutil/headerlet.py b/lib/stwcs/wcsutil/headerlet.py
index c2abad0..971efd5 100644
--- a/lib/stwcs/wcsutil/headerlet.py
+++ b/lib/stwcs/wcsutil/headerlet.py
@@ -19,8 +19,10 @@ import copy
 import time
 
 import numpy as np
-import pyfits
-import pywcs
+from astropy.io import fits as pyfits
+#import pywcs
+from astropy import wcs as pywcs
+from astropy.utils import lazyproperty
 
 import altwcs
 import wcscorr
@@ -2679,7 +2681,7 @@ class HeaderletHDU(pyfits.hdu.nonstandard.FitsHDU):
 
     _extension = 'HDRLET'
 
-    @pyfits.util.lazyproperty
+    @lazyproperty
     def headerlet(self):
         """Return the encapsulated headerlet as a Headerlet object.
 
diff --git a/lib/stwcs/wcsutil/hstwcs.py b/lib/stwcs/wcsutil/hstwcs.py
index 36e1de4..4bd6eb0 100644
--- a/lib/stwcs/wcsutil/hstwcs.py
+++ b/lib/stwcs/wcsutil/hstwcs.py
@@ -1,8 +1,10 @@
 from __future__ import division # confidence high
 
 import os
-from pywcs import WCS
-import pyfits
+#from pywcs import WCS
+from astropy.wcs import WCS
+from astropy.io import fits as  pyfits
+#import pyfits
 import instruments
 from stwcs.distortion import models, coeff_converter
 import altwcs
@@ -929,7 +931,6 @@ adaptive=False, detect_divergence=False, quiet=False)
         else:
             return np.dstack( [x, y] )[0]
 
-
     def _updatehdr(self, ext_hdr):
         #kw2add : OCX10, OCX11, OCY10, OCY11
         # record the model in the header for use by pydrizzle
diff --git a/lib/stwcs/wcsutil/mosaic.py b/lib/stwcs/wcsutil/mosaic.py
index d84c40b..18a4e28 100644
--- a/lib/stwcs/wcsutil/mosaic.py
+++ b/lib/stwcs/wcsutil/mosaic.py
@@ -1,7 +1,7 @@
 from __future__ import division
 import numpy as np
 from matplotlib import pyplot as plt
-import pyfits
+from astropy.io import fits as pyfits
 import string
 
 from stsci.tools import parseinput, irafglob
diff --git a/lib/stwcs/wcsutil/wcscorr.py b/lib/stwcs/wcsutil/wcscorr.py
index af04591..37ab677 100644
--- a/lib/stwcs/wcsutil/wcscorr.py
+++ b/lib/stwcs/wcsutil/wcscorr.py
@@ -1,5 +1,5 @@
 import os,copy
-import pyfits
+from astropy.io import fits as pyfits
 import numpy as np
 
 from stsci.tools import fileutil
diff --git a/lib/stwcs/wcsutil/wcsdiff.py b/lib/stwcs/wcsutil/wcsdiff.py
index 0d4b3a4..f027df2 100644
--- a/lib/stwcs/wcsutil/wcsdiff.py
+++ b/lib/stwcs/wcsutil/wcsdiff.py
@@ -1,7 +1,8 @@
 from __future__ import print_function
-import pywcs
+#import pywcs
+from astropy import wcs as pywcs
 from collections import OrderedDict
-import pyfits
+from astropy.io import fits as pyfits
 from .headerlet import parse_filename
 import numpy as np
 
@@ -147,4 +148,4 @@ def get_extname_extnum(ext):
     extnum=1
     extname = ext.header.get('EXTNAME', extname)
     extnum = ext.header.get('EXTVER', extnum)
-    return (extname, extnum)
-\ No newline at end of file
+    return (extname, extnum)