Fix deprecations in Python 3.7.

diff --git a/nmigen/compat/fhdl/module.py b/nmigen/compat/fhdl/module.py
index 6d12e82850c42d883d596997682d866a0faeb250..1b543ea5db661782b0532a8f0908c211e10e973d 100644 (file)
--- a/nmigen/compat/fhdl/module.py
+++ b/nmigen/compat/fhdl/module.py
@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 
 from ...tools import flatten, deprecated
 from ...fhdl import dsl

diff --git a/nmigen/fhdl/dsl.py b/nmigen/fhdl/dsl.py
index 72323bbb6d34a91246e9af08dd1e158cc5a49aa4..8e3507ba131ffb6f25380f51495a6334ce680459 100644 (file)
--- a/nmigen/fhdl/dsl.py
+++ b/nmigen/fhdl/dsl.py
@@ -1,4 +1,5 @@
-from collections import OrderedDict, Iterable
+from collections import OrderedDict
+from collections.abc import Iterable
 from contextlib import contextmanager
 
 from .ast import *

diff --git a/nmigen/fhdl/xfrm.py b/nmigen/fhdl/xfrm.py
index d6dbac84d86442bdd246d2a68f7fcec951711382..35699f1f74f6fdcbff7951c035ead37b8ff4099b 100644 (file)
--- a/nmigen/fhdl/xfrm.py
+++ b/nmigen/fhdl/xfrm.py
@@ -1,4 +1,5 @@
-from collections import OrderedDict, Iterable
+from collections import OrderedDict
+from collections.abc import Iterable
 
 from ..tools import flatten
 from .ast import *

diff --git a/nmigen/tools.py b/nmigen/tools.py
index 87b3377318aca6c6de4f3939b6fbb3ed07414ff5..0ab4638d0d53f52c19540fa866a8670978941c9b 100644 (file)
--- a/nmigen/tools.py
+++ b/nmigen/tools.py
@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 import functools
 import warnings