diff --git a/moto/swf/models/__init__.py b/moto/swf/models/__init__.py index 3b9129c2a..18db47e24 100644 --- a/moto/swf/models/__init__.py +++ b/moto/swf/models/__init__.py @@ -111,7 +111,7 @@ class SWFBackend(BaseBackend): self._check_string(domain_name) self._check_string(name) self._check_string(version) - for _, value in kwargs.iteritems(): + for _, value in kwargs.items(): self._check_none_or_string(value) domain = self._get_domain(domain_name) _type = domain.get_type(kind, name, version, ignore_empty=True) @@ -146,7 +146,7 @@ class SWFBackend(BaseBackend): self._check_string(workflow_name) self._check_string(workflow_version) self._check_none_or_list_of_strings(tag_list) - for _, value in kwargs.iteritems(): + for _, value in kwargs.items(): self._check_none_or_string(value) domain = self._get_domain(domain_name) @@ -190,7 +190,7 @@ class SWFBackend(BaseBackend): # # TODO: handle long polling (case 2) for decision tasks candidates = [] - for _task_list, tasks in domain.decision_task_lists.iteritems(): + for _task_list, tasks in domain.decision_task_lists.items(): if _task_list == task_list: candidates += filter(lambda t: t.state == "SCHEDULED", tasks) if any(candidates): @@ -290,7 +290,7 @@ class SWFBackend(BaseBackend): # # TODO: handle long polling (case 2) for activity tasks candidates = [] - for _task_list, tasks in domain.activity_task_lists.iteritems(): + for _task_list, tasks in domain.activity_task_lists.items(): if _task_list == task_list: candidates += filter(lambda t: t.state == "SCHEDULED", tasks) if any(candidates): @@ -309,7 +309,7 @@ class SWFBackend(BaseBackend): self._process_timeouts() domain = self._get_domain(domain_name) count = 0 - for _task_list, tasks in domain.activity_task_lists.iteritems(): + for _task_list, tasks in domain.activity_task_lists.items(): if _task_list == task_list: pending = [t for t in tasks if t.state in ["SCHEDULED", "STARTED"]] count += len(pending) diff --git a/moto/swf/models/domain.py b/moto/swf/models/domain.py index 066060b66..55bf1b8e8 100644 --- a/moto/swf/models/domain.py +++ b/moto/swf/models/domain.py @@ -63,8 +63,8 @@ class Domain(object): def find_types(self, kind, status): _all = [] - for _, family in self.types[kind].iteritems(): - for _, _type in family.iteritems(): + for _, family in self.types[kind].items(): + for _, _type in family.items(): if _type.status == status: _all.append(_type) return _all @@ -107,7 +107,7 @@ class Domain(object): @property def activity_tasks(self): _all = [] - for _, tasks in self.activity_task_lists.iteritems(): + for _, tasks in self.activity_task_lists.items(): _all += tasks return _all @@ -119,6 +119,6 @@ class Domain(object): @property def decision_tasks(self): _all = [] - for _, tasks in self.decision_task_lists.iteritems(): + for _, tasks in self.decision_task_lists.items(): _all += tasks return _all diff --git a/moto/swf/models/generic_type.py b/moto/swf/models/generic_type.py index 76fa98666..7c8389fbe 100644 --- a/moto/swf/models/generic_type.py +++ b/moto/swf/models/generic_type.py @@ -10,7 +10,7 @@ class GenericType(object): self.status = "REGISTERED" if "description" in kwargs: self.description = kwargs.pop("description") - for key, value in kwargs.iteritems(): + for key, value in kwargs.items(): self.__setattr__(key, value) # default values set to none for key in self._configuration_keys: diff --git a/moto/swf/models/history_event.py b/moto/swf/models/history_event.py index 176c92d7d..0b53f8659 100644 --- a/moto/swf/models/history_event.py +++ b/moto/swf/models/history_event.py @@ -10,7 +10,7 @@ class HistoryEvent(object): self.event_id = event_id self.event_type = event_type self.event_timestamp = now_timestamp() - for key, value in kwargs.iteritems(): + for key, value in kwargs.items(): self.__setattr__(key, value) # break soon if attributes are not valid self.event_attributes() diff --git a/moto/swf/models/workflow_execution.py b/moto/swf/models/workflow_execution.py index 8674d07fb..14523b079 100644 --- a/moto/swf/models/workflow_execution.py +++ b/moto/swf/models/workflow_execution.py @@ -256,7 +256,7 @@ class WorkflowExecution(object): def _check_decision_attributes(self, kind, value, decision_id): problems = [] constraints = DECISIONS_FIELDS.get(kind, {}) - for key, constraint in constraints.iteritems(): + for key, constraint in constraints.items(): if constraint["required"] and not value.get(key): problems.append({ "type": "null_value", diff --git a/tests/test_swf/test_utils.py b/tests/test_swf/test_utils.py index 9f7da8857..f8ff08f22 100644 --- a/tests/test_swf/test_utils.py +++ b/tests/test_swf/test_utils.py @@ -13,7 +13,7 @@ def test_decapitalize(): "FooBar": "fooBar", "FOO BAR": "fOO BAR", } - for before, after in cases.iteritems(): + for before, after in cases.items(): decapitalize(before).should.equal(after) @freeze_time("2015-01-01 12:00:00") diff --git a/tests/test_swf/utils.py b/tests/test_swf/utils.py index e6d73fe9a..70cbc4c13 100644 --- a/tests/test_swf/utils.py +++ b/tests/test_swf/utils.py @@ -29,7 +29,7 @@ SCHEDULE_ACTIVITY_TASK_DECISION = { "taskList": { "name": "activity-task-list" }, } } -for key, value in ACTIVITY_TASK_TIMEOUTS.iteritems(): +for key, value in ACTIVITY_TASK_TIMEOUTS.items(): SCHEDULE_ACTIVITY_TASK_DECISION["scheduleActivityTaskDecisionAttributes"][key] = value # A test Domain