replace iterkeys with python 3 equivalents

diff --git a/htsworkflow/pipelines/eland.py b/htsworkflow/pipelines/eland.py
index acc805a889d3000ffbe4a1f73cedec2930e47bbf..f1b0fdaa7b1d748a0b877976414836e3671167ba 100644 (file)
--- a/htsworkflow/pipelines/eland.py
+++ b/htsworkflow/pipelines/eland.py
@@ -659,8 +659,7 @@ class ELAND(collections.MutableMapping):
         del self.result[key]
 
     def __iter__(self):
-        keys = self.results.iterkeys()
-        for k in sorted(keys):
+        for k in sorted(self.results):
             yield k
 
     def __len__(self):

diff --git a/htsworkflow/pipelines/genomemap.py b/htsworkflow/pipelines/genomemap.py
index 6dfcf68fc235775a8280dd1bc0719e4fd513c7e4..d49103fc6c6dec94014a783ba6767ac3540fe03c 100644 (file)
--- a/htsworkflow/pipelines/genomemap.py
+++ b/htsworkflow/pipelines/genomemap.py
@@ -17,7 +17,7 @@ class GenomeMap(collections.MutableMapping):
         return len(self._contigs)
 
     def __iter__(self):
-        return self._contigs.iterkeys()
+        return iter(self._contigs.keys())
 
     def __getitem__(self, name):
         return self._contigs[name]

diff --git a/htsworkflow/pipelines/gerald.py b/htsworkflow/pipelines/gerald.py
index 9fef5d1bb473d5e6f689ba76ea839d39311482b4..b795b141ca736fa40ee815f4eb9cff1744f70d4f 100644 (file)
--- a/htsworkflow/pipelines/gerald.py
+++ b/htsworkflow/pipelines/gerald.py
@@ -399,7 +399,7 @@ class LaneSpecificRunParameters(collections.MutableMapping):
     def __iter__(self):
         if self._lanes is None:
             self._initialize_lanes()
-        return self._lanes.iterkeys()
+        return iter(self._lanes.keys())
 
     def __getitem__(self, key):
         if self._lanes is None: