Add destructor to FITS and RGB openers

- ensure files are closed when opener is dereferenced

ginga/BaseImage.py

@@ -156,15 +156,6 @@ def get_data(self):
     def _get_data(self):
         return self._data
 
-    def _get_fast_data(self):
-        """
-        Return an array similar to but possibly smaller than self._data,
-        for fast calculation of the intensity distribution.
-
-        NOTE: this is used by the Ginga plugin for Glue
-        """
-        return self._data
-
     def copy_data(self):
         data = self._get_data()
         return data.copy()
@@ -251,7 +242,7 @@ def has_valid_wcs(self):
                 self.wcs.has_valid_wcs())
 
     def _set_minmax(self):
-        data = self._get_fast_data()
+        data = self._get_data()
         try:
             self.maxval = np.nanmax(data)
             self.minval = np.nanmin(data)

ginga/util/io/io_fits.py

@@ -18,7 +18,6 @@
 """
 import re
 import numpy as np
-import warnings
 
 from ginga.AstroImage import AstroImage, AstroHeader
 from ginga.table.AstroTable import AstroTable
@@ -86,12 +85,6 @@ def use(fitspkg, raise_err=True):
 
 class BaseFitsFileHandler(io_base.BaseIOHandler):
 
-    # TODO: remove in a future version
-    @classmethod
-    def register_type(cls, name, klass):
-        raise Exception("This method has been deprecated;"
-                        "you don't need to call it anymore.")
-
     def __init__(self, logger):
         super(BaseFitsFileHandler, self).__init__(logger)
 
@@ -101,6 +94,9 @@ def __init__(self, logger):
         self.hdu_db = {}
         self.extver_db = {}
 
+    def __del__(self):
+        self.close()
+
     def get_factory(self):
         hdlr = self.__class__(self.logger)
         return hdlr
@@ -442,7 +438,8 @@ def close(self):
         self.info = None
         fits_f = self.fits_f
         self.fits_f = None
-        fits_f.close()
+        if fits_f is not None:
+            fits_f.close()
 
     def find_first_good_hdu(self):
 
@@ -547,16 +544,6 @@ def write_fits(self, path, data, header, **kwargs):
     def save_as_file(self, filepath, data, header, **kwargs):
         self.write_fits(filepath, data, header, **kwargs)
 
-    def fromHDU(self, hdu, ahdr):
-        warnings.warn("fromHDU will be deprecated in the next release--"
-                      "use copy_header instead",
-                      DeprecationWarning)
-        return self.copy_header(hdu, ahdr)
-
-
-# TO BE DEPRECATED
-PyFitsFileHandler = AstropyFitsFileHandler
-
 
 class FitsioFileHandler(BaseFitsFileHandler):
     """For loading FITS (Flexible Image Transport System) data files.
@@ -836,12 +823,6 @@ def write_fits(self, path, data, header):
     def save_as_file(self, filepath, data, header, **kwargs):
         self.write_fits(filepath, data, header, **kwargs)
 
-    def fromHDU(self, hdu, ahdr):
-        warnings.warn("fromHDU will be deprecated in the next release--"
-                      "use copy_header instead",
-                      DeprecationWarning)
-        return self.copy_header(hdu, ahdr)
-
 
 if not fits_configured:
     if have_astropy:

ginga/util/io/io_rgb.py

@@ -105,6 +105,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         self.close()
         return False
 
+    def __del__(self):
+        self.close()
+
     def load_idx_cont(self, idx_spec, loader_cont_fn, **kwargs):
 
         # TODO: raise an error if idx_spec doesn't match a single image