From 289705ae7733f5811eae35a17f091f0abe751357 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Thu, 29 Jan 2015 14:03:49 -0800 Subject: [PATCH] replace iterkeys with python 3 equivalents --- htsworkflow/pipelines/eland.py | 3 +-- htsworkflow/pipelines/genomemap.py | 2 +- htsworkflow/pipelines/gerald.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/htsworkflow/pipelines/eland.py b/htsworkflow/pipelines/eland.py index acc805a..f1b0fda 100644 --- 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 6dfcf68..d49103f 100644 --- 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 9fef5d1..b795b14 100644 --- 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: -- 2.30.2