diff --git a/ChangeLog b/ChangeLog index 6d910ad..8547019 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ -2017-01-03 +2017-02-09 * Version 1.2.0 released ======================== + Replace has_key() by in for Python 3.x compatibility (#1924) cslightcrv no longer accepts counts cubes on input (#1920) Set ctbin reference time to CTA reference time (#1922) Change ds9file parameter to outds9file diff --git a/NEWS b/NEWS index 2f7b2dd..9f587d4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ New Features and Important Changes in ctools 1.2.0 -3 February 2017 +9 February 2017 Introduction @@ -252,6 +252,9 @@ Examples -------- Add show_lightcurve script to display a light curve. +Replace has_key() by "in" in example scripts for Python 3.x compatibility +(#1924). + caldb ----- diff --git a/examples/show_sensitivity.py b/examples/show_sensitivity.py index 0f5e6e7..7aea2c1 100755 --- a/examples/show_sensitivity.py +++ b/examples/show_sensitivity.py @@ -2,7 +2,7 @@ # ========================================================================== # Display differential sensitivity plot generated by cssens # -# Copyright (C) 2015-2016 Juergen Knoedlseder +# Copyright (C) 2015-2017 Juergen Knoedlseder # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -62,7 +62,7 @@ def read_sensitivity(filename): # Check where file contains differential or integral sensitivity mode = 'Integral' - if sensitivity.has_key('emax'): + if 'emax' in sensitivity: emax_ref = -1.0 for value in sensitivity['emax']: if emax_ref < 0.0: @@ -76,14 +76,14 @@ def read_sensitivity(filename): # Add linear energy values if mode == 'Differential': - if sensitivity.has_key('loge'): + if 'loge' in sensitivity: name = 'energy' values = [] for value in sensitivity['loge']: values.append(math.pow(10.0, value)) sensitivity[name] = values else: - if sensitivity.has_key('emin'): + if 'emin' in sensitivity: name = 'energy' values = [] for value in sensitivity['emin']: