summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadia Dencheva <nadia.astropy@gmail.com>2017-02-04 13:46:42 -0500
committerGitHub <noreply@github.com>2017-02-04 13:46:42 -0500
commit02e4c14b36e3f38f51cde969c6286af396cfab8d (patch)
tree32897b9772982d89e933d59895f063eda5252f3e
parent52d5b5fef4b2a3f916ea93a8c3a04a85e21905c7 (diff)
parentb8602986db79bb3e2d5ce8b058f30ac32c4c5cbe (diff)
downloadstwcs_hcf-02e4c14b36e3f38f51cde969c6286af396cfab8d.tar.gz
Merge pull request #24 from nden/clobber-overwrite1.3.1rc
rename 'clobber' to 'overwrite' in calls to fits.writeto()
-rw-r--r--CHANGES.rst3
-rw-r--r--stwcs/wcsutil/headerlet.py14
2 files changed, 15 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 32a67c7..19442a1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,9 @@
1.3 (Unreleased)
----------------
+- The ``clobber`` parameter in `Headerlet.tofile()`` was replaced with
+ ``overwrite``. [#24]
+
1.2.5 (2016-12-20)
----------------
diff --git a/stwcs/wcsutil/headerlet.py b/stwcs/wcsutil/headerlet.py
index c26299c..5dacc30 100644
--- a/stwcs/wcsutil/headerlet.py
+++ b/stwcs/wcsutil/headerlet.py
@@ -20,6 +20,7 @@ import copy
import time
import numpy as np
+import astropy
from astropy.io import fits
from astropy import wcs as pywcs
from astropy.utils import lazyproperty
@@ -34,12 +35,18 @@ from . import wcscorr
from .hstwcs import HSTWCS
from .mappings import basic_wcs
+"""
+``clobber`` parameter in `astropy.io.fits.writeto()`` was renamed to
+``overwrite`` in astropy v1.3.
+"""
+from astropy.utils import minversion
+ASTROPY_13_MIN = minversion(astropy, "1.3")
+
from astropy import log
default_log_level = log.getEffectiveLevel()
# Logging support functions
-
class FuncNameLoggingFormatter(logging.Formatter):
def __init__(self, fmt=None, datefmt=None):
if '%(funcName)s' not in fmt:
@@ -2413,7 +2420,10 @@ class Headerlet(fits.HDUList):
"""
if not destim or not hdrname:
self.hverify()
- self.writeto(fname, clobber=clobber)
+ if ASTROPY_13_MIN:
+ self.writeto(fname, overwrite=clobber)
+ else:
+ self.writeto(fname, clobber=clobber)
def _del_dest_WCS(self, dest, ext=None):
"""