X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=python%2Fcumulus%2Fretention.py;h=210b25750a73fc5af99c8b40167ad0eeab8fa619;hb=da1d95d3242ee9d596e60b8d5bfcf9e5bedcd80f;hp=b0e007887f6e8cde917f8bf40efde9d09ac4161b;hpb=3d780590edec4583eb3ef0ca16120afd0f7451f9;p=cumulus.git diff --git a/python/cumulus/retention.py b/python/cumulus/retention.py index b0e0078..210b257 100644 --- a/python/cumulus/retention.py +++ b/python/cumulus/retention.py @@ -23,6 +23,8 @@ for example keeping daily snapshots for short periods of time but retaining weekly snapshots going back further in time. """ +from __future__ import division, print_function, unicode_literals + import calendar import datetime @@ -132,7 +134,7 @@ class RetentionEngine(object): self._labels = set() retain = False - for (backup_class, retention_period) in self._policies.iteritems(): + for (backup_class, retention_period) in self._policies.items(): partition = _backup_classes[backup_class](timestamp_policy) last_snapshot = self._last_snapshots[backup_class] if self._last_snapshots[backup_class][0] != partition: @@ -153,4 +155,4 @@ class RetentionEngine(object): def last_snapshots(self): """Returns the most recent snapshot in each backup class.""" return dict((k, v[1]) for (k, v) - in self._last_snapshots.iteritems() if v[2]) + in self._last_snapshots.items() if v[2])