@@ -110,7 +110,14 @@ def getheader(filename, *args, **kwargs):
110110 hdu = hdulist[extidx]
111111 header = hdu.header
112112 finally:
113- hdulist.close(closed=closed)
113+ # Use _close instead of close to close without loading any
114+ # remaining HDUs for pre-lazy-loading backwards compatibility
115+ # In other words, when the full HDUList is opened by a user they
116+ # previously expected to be able to look at arbitrary HDUs even
117+ # after the file was closed, but for getheader and other convenience
118+ # functions this is irrelevant
119+ hdulist._close(closed=closed)
120+
114121 return header
115122
116123
@@ -206,7 +213,8 @@ def getdata(filename, *args, **kwargs):
206213 if header:
207214 hdr = hdu.header
208215 finally:
209- hdulist.close(closed=closed)
216+ # _close instead of close; see note in getheader
217+ hdulist._close(closed=closed)
210218
211219 # Change case of names if requested
212220 trans = None
@@ -342,7 +350,8 @@ def setval(filename, keyword, *args, **kwargs):
342350 comment = None
343351 hdulist[extidx].header.set(keyword, value, comment, before, after)
344352 finally:
345- hdulist.close(closed=closed)
353+ # _close instead of close; see note in getheader
354+ hdulist._close(closed=closed)
346355
347356
348357def delval(filename, keyword, *args, **kwargs):
@@ -380,7 +389,8 @@ def delval(filename, keyword, *args, **kwargs):
380389 try:
381390 del hdulist[extidx].header[keyword]
382391 finally:
383- hdulist.close(closed=closed)
392+ # _close instead of close; see note in getheader
393+ hdulist._close(closed=closed)
384394
385395
386396@deprecated_renamed_argument('clobber', 'overwrite', '1.3')
@@ -586,14 +596,15 @@ def append(filename, data, header=None, checksum=False, verify=True, **kwargs):
586596 # when writing the file.
587597 hdu._output_checksum = checksum
588598 finally:
589- f.close(closed=closed)
599+ # _close instead of close; see note in getheader
600+ f._close(closed=closed)
590601 else:
591602 f = _File(filename, mode='append')
592603 try:
593604 hdu._output_checksum = checksum
594605 hdu._writeto(f)
595606 finally:
596- f.close ()
607+ f._close ()
597608
598609
599610def update(filename, data, *args, **kwargs):
@@ -652,7 +663,8 @@ def update(filename, data, *args, **kwargs):
652663 try:
653664 hdulist[_ext] = new_hdu
654665 finally:
655- hdulist.close(closed=closed)
666+ # _close instead of close; see note in getheader
667+ hdulist._close(closed=closed)
656668
657669
658670def info(filename, output=None, **kwargs):
@@ -689,7 +701,8 @@ def info(filename, output=None, **kwargs):
689701 ret = f.info(output=output)
690702 finally:
691703 if closed:
692- f.close()
704+ # _close instead of close; see note in getheader
705+ f._close()
693706
694707 return ret
695708
@@ -759,7 +772,8 @@ def tabledump(filename, datafile=None, cdfile=None, hfile=None, ext=1,
759772 f[ext].dump(datafile, cdfile, hfile, overwrite)
760773 finally:
761774 if closed:
762- f.close()
775+ # _close instead of close; see note in getheader
776+ f._close()
763777
764778if isinstance(tabledump.__doc__, string_types):
765779 tabledump.__doc__ += BinTableHDU._tdump_file_format.replace('\n', '\n ')
0 commit comments