Merge pull request #41 from pllim/astropy2-compat

Astropy 2.0 compatibility

commissioning/doscalars.py

@@ -6,6 +6,9 @@
 import pylab as P
 import matplotlib
 
+from pysynphot.compat import ASTROPY_LT_1_3
+
+
 def getdata(dirpath,fieldname,instr,save=True):
     #get the list of files
     flist=glob.glob("%s/*.log"%dirpath)
@@ -71,7 +74,10 @@ def getdata(dirpath,fieldname,instr,save=True):
         tbhdu=pyfits.BinTableHDU.from_columns(pyfits.ColDefs([c1,c2,c3,c4,c5]))
         outname=os.path.join(os.path.abspath(os.path.dirname(dirpath)),
                              "%s_%s_table.fits"%(instr,fieldname))
-        tbhdu.writeto(outname,clobber=True)
+        if ASTROPY_LT_1_3:
+            tbhdu.writeto(outname, clobber=True)
+        else:
+            tbhdu.writeto(outname, overwrite=True)
 
     #and return the values for immediate use
     return namedict,odict,sdict,obsmode,spectrum,val

pysynphot/compat.py

@@ -0,0 +1,9 @@
+"""Module to handle compatibility with dependencies like Astropy."""
+from __future__ import absolute_import, division, print_function
+
+import astropy
+from astropy.utils.introspection import minversion
+
+__all__ = ['ASTROPY_LT_1_3']
+
+ASTROPY_LT_1_3 = not minversion(astropy, '1.3')