migen.fhdl.tools: move flat_iteration to migen.util.misc as tools imports other things
authorRobert Jordens <jordens@gmail.com>
Tue, 3 Dec 2013 00:23:22 +0000 (17:23 -0700)
committerSebastien Bourdeauducq <sebastien@milkymist.org>
Tue, 3 Dec 2013 20:36:33 +0000 (21:36 +0100)
migen/fhdl/module.py
migen/fhdl/tools.py
migen/util/misc.py

index 4764abbc8245b6fba9797295c2bfa62f5de1409e..30e065b6ea04230ee801589cc1f5451060806a2f 100644 (file)
@@ -4,7 +4,8 @@ from itertools import combinations
 from migen.fhdl.structure import *
 from migen.fhdl.structure import _Fragment
 from migen.fhdl.specials import Special
-from migen.fhdl.tools import flat_iteration, rename_clock_domain
+from migen.fhdl.tools import rename_clock_domain
+from migen.util.misc import flat_iteration
 
 class FinalizeError(Exception):
        pass
index d94075918d2600355430fc5c0e166bb28fa6a94f..b25280baf534e6181847f193cfc38c51c068fc30 100644 (file)
@@ -1,17 +1,8 @@
-import collections
-
 from migen.fhdl.structure import *
 from migen.fhdl.structure import _Slice, _Assign
 from migen.fhdl.visit import NodeVisitor, NodeTransformer
 from migen.fhdl.size import value_bits_sign
-
-def flat_iteration(l):
-       for element in l:
-               if isinstance(element, collections.Iterable):
-                       for element2 in flat_iteration(element):
-                               yield element2
-               else:
-                       yield element
+from migen.util.misc import flat_iteration
 
 class _SignalLister(NodeVisitor):
        def __init__(self):
index fa041618a2a4653b8e8baefd0a1ae7342329ecd1..6846b4a5bab47a1de2be33c4f653386bdee53d3d 100644 (file)
@@ -1,3 +1,13 @@
+import collections
+
+def flat_iteration(l):
+       for element in l:
+               if isinstance(element, collections.Iterable):
+                       for element2 in flat_iteration(element):
+                               yield element2
+               else:
+                       yield element
+
 def xdir(obj, return_values=False):
        for attr in dir(obj):
                if attr[:2] != "__" and attr[-2:] != "__":