Merge pull request #104 from SpiNNakerManchester/not_abc

fixed incorrect import from collections.abc
SpiNNakerManchester · Oct 21, 2019 · 90840e0 · 90840e0
2 parents 56b8cbf + abc83bb
commit 90840e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/setup.py b/setup.py
@@ -17,10 +17,7 @@
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
-try:
-    from collections.abc import defaultdict
-except ImportError:
-    from collections import defaultdict
+from collections import defaultdict
 import os
 
 __version__ = None

diff --git a/spinn_utilities/ordered_default_dict.py b/spinn_utilities/ordered_default_dict.py
@@ -13,10 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from collections import OrderedDict
 try:
-    from collections.abc import OrderedDict, Callable
+    from collections.abc import Callable
 except ImportError:
-    from collections import OrderedDict, Callable
+    from collections import Callable
 
 
 class DefaultOrderedDict(OrderedDict):