further changes to move to astropy

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

9 files changed, 4 insertions, 22 deletions

diff --git a/lib/stwcs/gui/apply_headerlet.py b/lib/stwcs/gui/apply_headerlet.py
index 8d8daf9..9f51029 100644
--- a/lib/stwcs/gui/apply_headerlet.py
+++ b/lib/stwcs/gui/apply_headerlet.py
@@ -1,8 +1,5 @@
 import os
 import string
-
-#import pyfits
-from astropy.io import fits as pyfits
 from stsci.tools import teal, parseinput
 
 import stwcs
diff --git a/lib/stwcs/gui/archive_headerlet.py b/lib/stwcs/gui/archive_headerlet.py
index 65e133a..70dbc89 100644
--- a/lib/stwcs/gui/archive_headerlet.py
+++ b/lib/stwcs/gui/archive_headerlet.py
@@ -1,8 +1,7 @@
 import os
 import string
 
-#import pyfits
-from astropy.io import fits as pyfits
+from astropy.io import fits
 from stsci.tools import teal
 
 import stwcs
diff --git a/lib/stwcs/gui/attach_headerlet.py b/lib/stwcs/gui/attach_headerlet.py
index 5a3bdc8..873c549 100644
--- a/lib/stwcs/gui/attach_headerlet.py
+++ b/lib/stwcs/gui/attach_headerlet.py
@@ -1,7 +1,5 @@
 import os
 
-#import pyfits
-from astropy.io import fits as pyfits
 from stsci.tools import teal
 
 import stwcs
diff --git a/lib/stwcs/gui/delete_headerlet.py b/lib/stwcs/gui/delete_headerlet.py
index f25c545..96d3ed1 100644
--- a/lib/stwcs/gui/delete_headerlet.py
+++ b/lib/stwcs/gui/delete_headerlet.py
@@ -1,7 +1,5 @@
 import os
 
-#import pyfits
-from astropy.io import fits as pyfits
 from stsci.tools import teal
 from stsci.tools import parseinput
 
diff --git a/lib/stwcs/gui/extract_headerlet.py b/lib/stwcs/gui/extract_headerlet.py
index 16a0aee..972f5c7 100644
--- a/lib/stwcs/gui/extract_headerlet.py
+++ b/lib/stwcs/gui/extract_headerlet.py
@@ -1,7 +1,5 @@
 import os
 
-#import pyfits
-from astropy.io import fits as pyfits
 from stsci.tools import teal
 
 import stwcs
diff --git a/lib/stwcs/gui/headerlet_summary.py b/lib/stwcs/gui/headerlet_summary.py
index 7772a95..82a3e0c 100644
--- a/lib/stwcs/gui/headerlet_summary.py
+++ b/lib/stwcs/gui/headerlet_summary.py
@@ -1,7 +1,4 @@
 import os
-
-#import pyfits
-from astropy.io import fits as pyfits
 from stsci.tools import teal
 
 import stwcs
diff --git a/lib/stwcs/gui/restore_headerlet.py b/lib/stwcs/gui/restore_headerlet.py
index 46575db..2f46bb7 100644
--- a/lib/stwcs/gui/restore_headerlet.py
+++ b/lib/stwcs/gui/restore_headerlet.py
@@ -1,8 +1,6 @@
 import os
 import string
 
-#import pyfits
-from astropy.io import fits as pyfits
 from stsci.tools import teal
 
 import stwcs
diff --git a/lib/stwcs/gui/updatewcs.py b/lib/stwcs/gui/updatewcs.py
index 1e5b9d9..f8f10d7 100644
--- a/lib/stwcs/gui/updatewcs.py
+++ b/lib/stwcs/gui/updatewcs.py
@@ -1,7 +1,6 @@
 import os
 
-#import pyfits
-from astropy.io import fits as pyfits
+from astropy.io import fits
 from stsci.tools import parseinput
 from stsci.tools import fileutil
 from stsci.tools import teal
@@ -67,7 +66,7 @@ def run(configObj=None):
     #
     for file in input:
         # Check to insure that there is a valid reference file to be used
-        idctab = pyfits.getval(file,'idctab')
+        idctab = fits.getval(file, 'idctab')
         if not os.path.exists(fileutil.osfn(idctab)):
             print 'No valid distortion reference file ',idctab,' found in ',file,'!'
             raise ValueError
@@ -78,7 +77,7 @@ def run(configObj=None):
     #
     for file in input:
         # get instrument name from input file
-        instr = pyfits.getval(file,'INSTRUME')
+        instr = fits.getval(file,'INSTRUME')
         # make copy of input parameters dict for this file
         fdict = cdict.copy()
         # Remove any parameter that is not part of this instrument's allowed corrections
diff --git a/lib/stwcs/gui/write_headerlet.py b/lib/stwcs/gui/write_headerlet.py
index 9ba0639..353e32b 100644
--- a/lib/stwcs/gui/write_headerlet.py
+++ b/lib/stwcs/gui/write_headerlet.py
@@ -1,7 +1,5 @@
 import os
 
-#import pyfits
-from astropy.io import fits as pyfits
 from stsci.tools import teal
 from stsci.tools import parseinput