Make sure ABCs come from collections.abc

openmc/arithmetic.py

@@ -1,6 +1,6 @@
 import sys
 import copy
-from collections import Iterable
+from collections.abc import Iterable
 
 import numpy as np
 import pandas as pd

openmc/data/photon.py

@@ -1,4 +1,5 @@
-from collections import OrderedDict, Mapping, Callable
+from collections import OrderedDict
+from collections.abc import Mapping, Callable
 from copy import deepcopy
 from io import StringIO
 from numbers import Integral, Real

openmc/data/resonance_covariance.py

@@ -1,4 +1,4 @@
-from collections import MutableSequence
+from collections.abc import MutableSequence
 import warnings
 import io
 import copy

openmc/filter.py

@@ -1,5 +1,6 @@
 from abc import ABCMeta
-from collections import Iterable, OrderedDict
+from collections import OrderedDict
+from collections.abc import Iterable
 import copy
 import hashlib
 from itertools import product

openmc/mesh.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 from numbers import Real, Integral
 from xml.etree import ElementTree as ET
 import sys

openmc/mgxs/groups.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 from numbers import Real
 import copy
 import sys

openmc/universe.py

@@ -1,4 +1,5 @@
-from collections import OrderedDict, Iterable
+from collections import OrderedDict
+from collections.abc import Iterable
 from copy import copy, deepcopy
 from numbers import Integral, Real
 import random

tests/unit_tests/test_data_decay.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from collections import Mapping
+from collections.abc import Mapping
 import os
 from math import log
 

tests/unit_tests/test_data_misc.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from collections import Mapping
+from collections.abc import Mapping
 import os
 
 import numpy as np

tests/unit_tests/test_data_neutron.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from collections import Mapping, Callable
+from collections.abc import Mapping, Callable
 import os
 
 import numpy as np

tests/unit_tests/test_data_photon.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from collections import Mapping, Callable
+from collections.abc import Mapping, Callable
 import os
 
 import numpy as np

tests/unit_tests/test_data_thermal.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from collections import Callable
+from collections.abc import Callable
 import os
 
 import numpy as np