Skip to content
Browse files

Use enumerate(x) instead of zip(range(x), x)

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
  • Loading branch information...
1 parent 2b3f00c commit 8380318e846df2f58d5bec063238209c17f52e5c @larsclausen larsclausen committed Feb 2, 2012
Showing with 8 additions and 8 deletions.
  1. +2 −2 migen/actorlib/control.py
  2. +2 −2 migen/corelogic/fsm.py
  3. +4 −4 migen/flow/plumbing.py
View
4 migen/actorlib/control.py
@@ -17,9 +17,9 @@ def __init__(self, *maxima, start=False, step=False):
if step: params.append("step")
self.d_bv = [BV(bits_for(dimension)) for dimension in maxima]
l_sink = [("d{0}".format(n), [(p, bv) for p in params])
- for n, bv in zip(range(len(self.d_bv)), self.d_bv)]
+ for n, bv in enumerate(self.d_bv)]
l_source = [("d{0}".format(n), bv)
- for n, bv in zip(range(len(self.d_bv)), self.d_bv)]
+ for n, bv in enumerate(self.d_bv)]
Actor.__init__(self, SchedulingModel(SchedulingModel.DYNAMIC),
("sink", Sink, l_sink),
("source", Source, l_source))
View
4 migen/corelogic/fsm.py
@@ -5,7 +5,7 @@ def __init__(self, *states):
self._state_bv = BV(bits_for(len(states)-1))
self._state = Signal(self._state_bv)
self._next_state = Signal(self._state_bv)
- for state, n in zip(states, range(len(states))):
+ for n, state in enumerate(states):
setattr(self, state, Constant(n, self._state_bv))
self.actions = [[] for i in range(len(states))]
@@ -20,7 +20,7 @@ def act(self, state, *statements):
def get_fragment(self):
cases = [[Constant(s, self._state_bv)] + a
- for s, a in zip(range(len(self.actions)), self.actions) if a]
+ for s, a in enumerate(self.actions) if a]
comb = [
self._next_state.eq(self._state),
Case(self._state, *cases)
View
8 migen/flow/plumbing.py
@@ -19,8 +19,8 @@ class Combinator(Actor):
def __init__(self, layout, *subrecords):
source = Record(layout)
subrecords = [source.subrecord(*subr) for subr in subrecords]
- eps = [("sink{0}".format(x[0]), Sink, x[1])
- for x in zip(range(len(subrecords)), subrecords)]
+ eps = [("sink{0}".format(n), Sink, r)
+ for x in enumerate(subrecords)]
ep_source = ("source", Source, source)
eps.append(ep_source)
Actor.__init__(self,
@@ -39,8 +39,8 @@ class Splitter(Actor):
def __init__(self, layout, *subrecords):
sink = Record(layout)
subrecords = [sink.subrecord(*subr) for subr in subrecords]
- eps = [("source{0}".format(x[0]), Source, x[1])
- for x in zip(range(len(subrecords)), subrecords)]
+ eps = [("source{0}".format(n), Source, r)
+ for n, r in enumerate(subrecords)]
ep_sink = ("sink", Sink, sink)
eps.append(ep_sink)
Actor.__init__(self,

0 comments on commit 8380318

Please sign in to comment.
Something went wrong with that request. Please try again.