astrofrog · Nov 2, 2014 · Oct 30, 2014 · Oct 30, 2014 · Oct 30, 2014 · Oct 30, 2014
diff --git a/docs/figures/region_drawing.py b/docs/figures/region_drawing.py
@@ -4,14 +4,11 @@
 import matplotlib.cm as cm
 
 import pyregion
-try:
-    from astropy.io import fits as pyfits
-except ImportError:
-    import pyfits
+from astropy.io import fits
 
 # read in the image
 xray_name="pspc_skyview.fits"
-f_xray = pyfits.open(xray_name)
+f_xray = fits.open(xray_name)
 
 try:
     import pywcsgrid2

diff --git a/docs/figures/region_drawing2.py b/docs/figures/region_drawing2.py
@@ -4,14 +4,11 @@
 import matplotlib.cm as cm
 
 import pyregion
-try:
-    from astropy.io import fits as pyfits
-except ImportError:
-    import pyfits
+from astropy.io import fits
 
 # read in the image
 xray_name= "pspc_skyview.fits"
-f_xray = pyfits.open(xray_name)
+f_xray = fits.open(xray_name)
 
 try:
     import pywcsgrid2

diff --git a/docs/users/installing.rst b/docs/users/installing.rst
@@ -70,19 +70,6 @@ astropy
 -------
 * OPTIONAL
 * `Astropy <https://github.com/astropy/astropy/>`__
-* With astropy installed, pywcs and pyfits are not needed.
-
-pywcs
------
-* OPTIONAL
-* used for coordinate conversions
-* `Homepage <https://trac.assembla.com/astrolib/>`__
-
-pyfits
-------
-* OPTIONAL
-* `Homepage <http://www.stsci.edu/resources/software_hardware/pyfits>`__
-
 
 matplotlib
 ----------

diff --git a/docs/users/overview.rst b/docs/users/overview.rst
@@ -118,10 +118,10 @@ The shape object has following attributes,
 The ShapeList class have a few method that could be
 useful. *ShapeList.as_imagecoord* returns a new ShapeList instance
 with the coordinates converted to the image coordinate. It
-requires the Pyfits.Header instance.::
+requires the astropy.io.fits.Header instance.::
 
-    import pyfits
-    f = pyfits.open("t1.fits")
+    from astropy.io import fits
+    f = fits.open("t1.fits")
     r2 = pyregion.parse(region_string).as_imagecoord(f[0].header)
 
 The return value is a new ShapeList instance, but the coordinate is

diff --git a/examples/demo_helper.py b/examples/demo_helper.py
@@ -3,31 +3,6 @@
 
 import math
 
-try:
-    from astropy.io import fits as pyfits
-except ImportError:
-    import pyfits
-
-# At some point, pyfits.Card.fromstring has changed from unbound
-# method to bounded method.
-
-if pyfits.Card.fromstring.__self__: # 
-    def pyfits_card_fromstring(l):
-        return pyfits.Card.fromstring(l)
-else:
-    def pyfits_card_fromstring(l):
-        c = pyfits.Card()
-        return c.fromstring(l)
-
-def demo_header():
-    cards = pyfits.CardList()
-    for l in open("sample_fits01.header"):
-        card = pyfits_card_fromstring(l.strip())
-        cards.append(card)
-    h = pyfits.Header(cards)
-    return h
-
-
 def show_region(fig, region_list):
     h = demo_header()
 

diff --git a/examples/demo_print_region.py b/examples/demo_print_region.py
@@ -2,20 +2,10 @@
 
 import math
 
-try:
-    from astropy.io import fits as pyfits
-except ImportError:
-    import pyfits
-
-from demo_helper import pyfits_card_fromstring
+from astropy.io.fits import Header
 
 def test_header():
-    cards = pyfits.CardList()
-    for l in open("test.header"):
-        card = pyfits_card_fromstring(l.strip())
-        cards.append(card)
-    h = pyfits.Header(cards)
-    return h
+    return Header.fromtextfile("test.header")
 
 def print_region(r):
     for i, l in enumerate(r):

diff --git a/examples/demo_region03.py b/examples/demo_region03.py
@@ -1,7 +1,4 @@
-try:
-    from astropy.io import fits as pyfits
-except ImportError:
-    import pyfits
+from astropy.io.fits import Header
 
 import matplotlib.pyplot as plt
 import pyregion
@@ -11,17 +8,8 @@
 from mpl_toolkits.axes_grid1 import ImageGrid
 import pywcsgrid2
 
-
-from demo_helper import pyfits_card_fromstring
-
-
 def get_test_header():
-    cards = pyfits.CardList()
-    for l in open("sample_fits01.header"):
-        card = pyfits_card_fromstring(l.strip())
-        cards.append(card)
-    h = pyfits.Header(cards)
-    return h
+    return Header.fromtextfile('sample_fits01.header')
 
 if 1:
 

diff --git a/examples/demo_region04.py b/examples/demo_region04.py
@@ -1,8 +1,3 @@
-try:
-    from astropy.io import fits as pyfits
-except ImportError:
-    import pyfits
-
 import matplotlib.pyplot as plt
 import pyregion
 

diff --git a/examples/demo_region_filter01.py b/examples/demo_region_filter01.py
@@ -1,22 +1,12 @@
-try:
-    from astropy.io import fits as pyfits
-except ImportError:
-    import pyfits
-
-from demo_helper import pyfits_card_fromstring
+from astropy.io.fits import Header
 
 import matplotlib.pyplot as plt
 
 import pyregion
 
 # read in the image
 def demo_header():
-    cards = pyfits.CardList()
-    for l in open("sample_fits02.header"):
-        card = pyfits_card_fromstring(l.strip())
-        cards.append(card)
-    h = pyfits.Header(cards)
-    return h
+    return Header.fromtextfile("sample_fits02.header")
 
 header = demo_header() # sample fits header
 shape = (header["NAXIS1"], header["NAXIS2"])

diff --git a/pyregion/conftest.py b/pyregion/conftest.py
@@ -6,4 +6,4 @@
 
 ## Uncomment the following line to treat all DeprecationWarnings as
 ## exceptions
-# enable_deprecations_as_exceptions()
+enable_deprecations_as_exceptions()
diff --git a/pyregion/core.py b/pyregion/core.py
@@ -219,7 +219,7 @@ def read_region_as_imagecoord(s, header, rot_wrt_axis=1):
 
 def get_mask(region, hdu, origin=1):
     """
-    f = pyfits.read("test.fits")
+    f = fits.read("test.fits")
     reg = read_region_as_imagecoord(s, f[0].header)
     mask = get_mask(reg, f[0])
     """

diff --git a/pyregion/tests/test_get_mask.py b/pyregion/tests/test_get_mask.py
@@ -1,37 +1,18 @@
 import os
 from os.path import join
 
-try:
-    from astropy.io import fits as pyfits
-except ImportError:
-    import pyfits
+from astropy.io.fits import Header
 
 import numpy as np
 
 from ..wcs_helper import fix_lon
 from .. import open as pyregion_open
 from .. import get_mask
 
-# At some point, pyfits.Card.fromstring has changed from unbound
-# method to bounded method.
-
-if pyfits.Card.fromstring.__self__: # 
-    def pyfits_card_fromstring(l):
-        return pyfits.Card.fromstring(l)
-else:
-    def pyfits_card_fromstring(l):
-        c = pyfits.Card()
-        return c.fromstring(l)
-
 rootdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'examples')
 
 def demo_header():
-    cards = pyfits.CardList()
-    for l in open(join(rootdir, "sample_fits01.header")):
-        card = pyfits_card_fromstring(l.strip())
-        cards.append(card)
-    h = pyfits.Header(cards)
-    return h
+    return Header.fromtextfile(join(rootdir, "sample_fits01.header"))
 
 def test_region():
 
@@ -53,4 +34,4 @@ def test_region():
     # for reg_name in region_list:
     #     r = pyregion_open(join(rootdir,reg_name)).as_imagecoord(header)
     #     get_mask(r)
-        
+
diff --git a/pyregion/tests/test_region.py b/pyregion/tests/test_region.py
@@ -1,36 +1,17 @@
 import os
 from os.path import join
 
-try:
-    from astropy.io import fits as pyfits
-except ImportError:
-    import pyfits
+from astropy.io.fits import Header
 
 import numpy as np
 
 from ..wcs_helper import fix_lon
 from .. import open as pyregion_open
 
-# At some point, pyfits.Card.fromstring has changed from unbound
-# method to bounded method.
-
-if pyfits.Card.fromstring.__self__: # 
-    def pyfits_card_fromstring(l):
-        return pyfits.Card.fromstring(l)
-else:
-    def pyfits_card_fromstring(l):
-        c = pyfits.Card()
-        return c.fromstring(l)
-
 rootdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'examples')
 
 def demo_header():
-    cards = pyfits.CardList()
-    for l in open(join(rootdir, "sample_fits01.header")):
-        card = pyfits_card_fromstring(l.strip())
-        cards.append(card)
-    h = pyfits.Header(cards)
-    return h
+    return Header.fromtextfile(join(rootdir, "sample_fits01.header"))
 
 def test_region():
 
@@ -66,4 +47,3 @@ def test_region():
                 assert np.allclose(reg0.coord_list, reg.coord_list,
                                    atol=0.01)
             assert reg0.exclude == reg.exclude
-
diff --git a/pyregion/tests/test_wcs_helper.py b/pyregion/tests/test_wcs_helper.py
@@ -2,10 +2,7 @@
 
 from .. import parse
 
-try:
-    from astropy import wcs as pywcs
-except ImportError:
-    import pywcs
+from astropy.wcs import WCS
 
 def test_estimate_cdelt():
     l,b=0,0
@@ -16,7 +13,7 @@ def test_estimate_cdelt():
     # This is 'almost' the ra,dec of l,b=0,0 - works
     # ra,dec=266.40,-28.93
 
-    wcs = pywcs.WCS(naxis=2)
+    wcs = WCS(naxis=2)
 
     wcs.wcs.crpix = [5.5, 5.5]
     wcs.wcs.cdelt = [0.1, -0.1]
@@ -26,7 +23,7 @@ def test_estimate_cdelt():
     import pyregion.wcs_helper as wcs_helper
     proj = wcs_helper.get_kapteyn_projection(wcs)
     cdelt = wcs_helper.estimate_cdelt(proj, 5.5, 5.5)
-    
+
     assert np.allclose([cdelt], [0.1])
 
     region_string="fk5; circle(%s, %s, 0.5000)" % (ra,dec)