From: whitequark <whitequark@whitequark.org>
Date: Fri, 14 Dec 2018 23:56:26 +0000 (+0000)
Subject: Fix deprecations in Python 3.7.
X-Git-Tag: working~235
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c7b43ea49f9ebb6797cc8ffe2507b0c031d86fc;p=nmigen.git

Fix deprecations in Python 3.7.
---

diff --git a/nmigen/compat/fhdl/module.py b/nmigen/compat/fhdl/module.py
index 6d12e82..1b543ea 100644
--- 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 72323bb..8e3507b 100644
--- 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 d6dbac8..35699f1 100644
--- 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 87b3377..0ab4638 100644
--- 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