changes to use astropy instead of pyfits and pywcs

git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stwcs/trunk@31240 fe389314-cf27-0410-b35b-8c050e845b92

4 files changed, 11 insertions, 9 deletions

diff --git a/lib/stwcs/updatewcs/__init__.py b/lib/stwcs/updatewcs/__init__.py
index 8778065..4930082 100644
--- a/lib/stwcs/updatewcs/__init__.py
+++ b/lib/stwcs/updatewcs/__init__.py
@@ -1,12 +1,14 @@
 from __future__ import division # confidence high
 
 import os
-import pyfits
+from astropy.io import fits as pyfits
 import numpy as np
 from stwcs import wcsutil
 from stwcs.wcsutil import HSTWCS
 import stwcs
-import pywcs
+#import pywcs
+from astropy import wcs as pywcs
+import astropy
 
 import utils, corrections, makewcs
 import npol, det2im
@@ -171,7 +173,7 @@ def makecorr(fname, allowed_corr):
     if 'HISTORY' in f[0].header:
         f[0].header.update(key='UPWCSVER', value=stwcs.__version__,
                            comment="Version of STWCS used to updated the WCS", before='HISTORY')
-        f[0].header.update(key='PYWCSVER', value=pywcs.__version__,
+        f[0].header.update(key='PYWCSVER', value=astropy.__version__,
             comment="Version of PYWCS used to updated the WCS", before='HISTORY')
     elif 'ASN_MTYP' in f[0].header:
         f[0].header.update(key='UPWCSVER', value=stwcs.__version__,
diff --git a/lib/stwcs/updatewcs/apply_corrections.py b/lib/stwcs/updatewcs/apply_corrections.py
index 740d424..fa56db6 100644
--- a/lib/stwcs/updatewcs/apply_corrections.py
+++ b/lib/stwcs/updatewcs/apply_corrections.py
@@ -1,7 +1,7 @@
 from __future__ import division # confidence high
 
 import os
-import pyfits
+from astropy.io import fits as pyfits
 import time
 from stsci.tools import fileutil
 import os.path
diff --git a/lib/stwcs/updatewcs/det2im.py b/lib/stwcs/updatewcs/det2im.py
index dd48bc5..de98e1d 100644
--- a/lib/stwcs/updatewcs/det2im.py
+++ b/lib/stwcs/updatewcs/det2im.py
@@ -1,6 +1,6 @@
 from __future__ import division # confidence high
 
-import pyfits
+from astropy.io import fits as pyfits
 from stsci.tools import fileutil
 import utils
 import numpy as np
diff --git a/lib/stwcs/updatewcs/npol.py b/lib/stwcs/updatewcs/npol.py
index cebaa8e..9346439 100644
--- a/lib/stwcs/updatewcs/npol.py
+++ b/lib/stwcs/updatewcs/npol.py
@@ -1,6 +1,6 @@
 from __future__ import division # confidence high
 
-import pyfits
+from astropy.io import fits as pyfits
 from stsci.tools import fileutil
 import utils
 import numpy as np
@@ -83,7 +83,7 @@ class NPOLCorr(object):
                 if idccoeffs != None:
                     dx, dy = cls.transformData(dx,dy, idccoeffs)
 
-                # Determine EXTVER for the WCSDVARR extension from the 
+                # Determine EXTVER for the WCSDVARR extension from the
                 # NPL file (EXTNAME, EXTVER) kw.
                 # This is used to populate DPj.EXTVER kw
                 wcsdvarr_x_version = 2 * extversion -1
@@ -276,8 +276,8 @@ class NPOLCorr(object):
                                   sciheader.get('LTM'+si+'_'+si, 1)
             kw_val1['CRPIX'+si] = npol_header.get('CRPIX'+si, 0.0)
             kw_val1['CRVAL'+si] = (npol_header.get('CRVAL'+si, 0.0) - \
-                                  sciheader.get('LTV'+str(i), 0)) 
-            
+                                  sciheader.get('LTV'+str(i), 0))
+
         kw_comm0 = {'XTENSION': 'Image extension',
                     'BITPIX': 'IEEE floating point',
                     'NAXIS': 'Number of axes',