From eaadfbd75fa36c3f5c0e0f0f564a2a5b1ad61052 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 17 Jan 2020 14:14:33 +0000 Subject: [PATCH] update to new revision nmigen --- src/nmutil/nmoperator.py | 2 +- src/nmutil/queue.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nmutil/nmoperator.py b/src/nmutil/nmoperator.py index 87bc1898..fd50d2f5 100644 --- a/src/nmutil/nmoperator.py +++ b/src/nmutil/nmoperator.py @@ -164,7 +164,7 @@ def shape(i): def cat(i): """ flattens a compound structure recursively using Cat """ - from nmigen.tools import flatten + from nmigen._utils import flatten #res = list(flatten(i)) # works (as of nmigen commit f22106e5) HOWEVER... res = list(Visitor().iterate(i)) # needed because input may be a sequence return Cat(*res) diff --git a/src/nmutil/queue.py b/src/nmutil/queue.py index 069aa22c..3d47c639 100644 --- a/src/nmutil/queue.py +++ b/src/nmutil/queue.py @@ -24,7 +24,7 @@ # MODIFICATIONS. from nmigen import Module, Signal, Memory, Mux, Elaboratable -from nmigen.tools import bits_for +from nmigen.utils import bits_for from nmigen.cli import main from nmigen.lib.fifo import FIFOInterface -- 2.30.2