diff options
author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
---|---|---|
committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
commit | c49572a2e90b398e90a43f86b490f27ee6c58de6 (patch) | |
tree | d130cf7dfc3cf73157e1bece8173331bb4bc7156 /silx/io/convert.py | |
parent | 0bbc8ab933e62c1fa6d548e879ae6d98cbd461f1 (diff) | |
parent | cebdc9244c019224846cb8d2668080fe386a6adc (diff) |
Merge tag 'upstream/0.9.0+dfsg'
Upstream version 0.9.0+dfsg
Diffstat (limited to 'silx/io/convert.py')
-rw-r--r-- | silx/io/convert.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/silx/io/convert.py b/silx/io/convert.py index e9cbd2d..b08bfcc 100644 --- a/silx/io/convert.py +++ b/silx/io/convert.py @@ -64,7 +64,7 @@ except ImportError: __authors__ = ["P. Knobel"] __license__ = "MIT" -__date__ = "12/02/2018" +__date__ = "17/07/2018" _logger = logging.getLogger(__name__) @@ -92,11 +92,11 @@ def _create_link(h5f, link_name, target_name, if link_name not in h5f: _logger.debug("Creating link " + link_name + " -> " + target_name) elif overwrite_data: - _logger.warn("Overwriting " + link_name + " with link to " + + _logger.warning("Overwriting " + link_name + " with link to " + target_name) del h5f[link_name] else: - _logger.warn(link_name + " already exist. Cannot create link to " + + _logger.warning(link_name + " already exist. Cannot create link to " + target_name) return None @@ -212,7 +212,7 @@ class Hdf5Writer(object): member_initially_exists = h5_name in self._h5f if self.overwrite_data and member_initially_exists: - _logger.warn("Overwriting dataset: " + h5_name) + _logger.warning("Overwriting dataset: " + h5_name) del self._h5f[h5_name] if self.overwrite_data or not member_initially_exists: @@ -244,7 +244,7 @@ class Hdf5Writer(object): _attr_utf8(obj.attrs[key])) if not self.overwrite_data and member_initially_exists: - _logger.warn("Not overwriting existing dataset: " + h5_name) + _logger.warning("Not overwriting existing dataset: " + h5_name) elif is_group(obj): if h5_name not in self._h5f: |