openstack
/
automaton
Code Issues Proposed changes

Merge "Replace six.iteritems() with .items()"

This commit is contained in:
Jenkins 2017-01-12 16:50:09 +00:00 committed by Gerrit Code Review
parent ebfc4aa479 0a2eff6a20
commit afd9752947
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
automaton/machines.py
View File

@ -153,7 +153,7 @@ class FiniteMachine(object):
on_exit=state.on_exit) on_exit=state.on_exit)
for state in state_space: for state in state_space:
if state.next_states: if state.next_states:
for event, next_state in six.iteritems(state.next_states): for event, next_state in state.next_states.items():
if isinstance(next_state, State): if isinstance(next_state, State):
next_state = next_state.name next_state = next_state.name
m.add_transition(state.name, next_state, event) m.add_transition(state.name, next_state, event)
@ -367,11 +367,11 @@ class FiniteMachine(object):
else: else:
c.frozen = self.frozen c.frozen = self.frozen
if not shallow: if not shallow:
for state, data in six.iteritems(self._states): for state, data in self._states.items():
copied_data = data.copy() copied_data = data.copy()
copied_data['reactions'] = copied_data['reactions'].copy() copied_data['reactions'] = copied_data['reactions'].copy()
c._states[state] = copied_data c._states[state] = copied_data
for state, data in six.iteritems(self._transitions): for state, data in self._transitions.items():
c._transitions[state] = data.copy() c._transitions[state] = data.copy()
else: else:
c._transitions = self._transitions c._transitions = self._transitions
@ -402,7 +402,7 @@ class FiniteMachine(object):
def __iter__(self): def __iter__(self):
"""Iterates over (start, event, end) transition tuples.""" """Iterates over (start, event, end) transition tuples."""
for state in six.iterkeys(self._states): for state in six.iterkeys(self._states):
for event, target in six.iteritems(self._transitions[state]): for event, target in self._transitions[state].items():
yield (state, event, target.name) yield (state, event, target.name)
def pformat(self, sort=True, empty='.'): def pformat(self, sort=True, empty='.'):