Remove a few more __future__ imports. Use collections.abc

openmc/capi/cell.py

@@ -1,4 +1,4 @@
-from collections import Mapping, Iterable
+from collections.abc import Mapping, Iterable
 from ctypes import c_int, c_int32, c_double, c_char_p, POINTER
 from weakref import WeakValueDictionary
 

openmc/capi/filter.py

@@ -1,4 +1,4 @@
-from collections import Mapping
+from collections.abc import Mapping
 from ctypes import c_int, c_int32, c_double, c_char_p, POINTER, \
     create_string_buffer
 from weakref import WeakValueDictionary

openmc/capi/material.py

@@ -1,4 +1,4 @@
-from collections import Mapping
+from collections.abc import Mapping
 from ctypes import c_int, c_int32, c_double, c_char_p, POINTER
 from weakref import WeakValueDictionary
 

openmc/capi/nuclide.py

@@ -1,4 +1,4 @@
-from collections import Mapping
+from collections.abc import Mapping
 from ctypes import c_int, c_char_p, POINTER
 from weakref import WeakValueDictionary
 

openmc/capi/tally.py

@@ -1,4 +1,4 @@
-from collections import Mapping
+from collections.abc import Mapping
 from ctypes import c_int, c_int32, c_double, c_char_p, POINTER
 from weakref import WeakValueDictionary
 

openmc/cell.py

@@ -1,4 +1,5 @@
-from collections import OrderedDict, Iterable
+from collections import OrderedDict
+from collections.abc import Iterable
 from copy import deepcopy
 from math import cos, sin, pi
 from numbers import Real, Integral

openmc/checkvalue.py

@@ -1,5 +1,5 @@
 import copy
-from collections import Iterable
+from collections.abc import Iterable
 
 import numpy as np
 

openmc/cmfd.py

@@ -10,7 +10,7 @@ References
 
 """
 
-from collections import Iterable
+from collections.abc import Iterable
 from numbers import Real, Integral
 from xml.etree import ElementTree as ET
 import sys

openmc/data/angle_distribution.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 from io import StringIO
 from numbers import Real
 from warnings import warn

openmc/data/correlated.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 from numbers import Real, Integral
 from warnings import warn
 

openmc/data/decay.py

@@ -1,4 +1,5 @@
-from collections import Iterable, namedtuple
+from collections import namedtuple
+from collections.abc import Iterable
 from io import StringIO
 from math import log
 from numbers import Real

openmc/data/endf.py

@@ -10,7 +10,8 @@ import io
 import re
 import os
 from math import pi
-from collections import OrderedDict, Iterable
+from collections import OrderedDict
+from collections.abc import Iterable
 
 import numpy as np
 from numpy.polynomial.polynomial import Polynomial

openmc/data/energy_distribution.py

@@ -1,5 +1,5 @@
 from abc import ABCMeta, abstractmethod
-from collections import Iterable
+from collections.abc import Iterable
 from numbers import Integral, Real
 from warnings import warn
 

openmc/data/fission_energy.py

@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 from copy import deepcopy
 from io import StringIO
 import sys

openmc/data/function.py

@@ -1,5 +1,5 @@
 from abc import ABCMeta, abstractmethod
-from collections import Iterable, Callable
+from collections.abc import Iterable, Callable
 from numbers import Real, Integral
 
 import numpy as np

openmc/data/kalbach_mann.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 from numbers import Real, Integral
 from warnings import warn
 

openmc/data/laboratory.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 from numbers import Real, Integral
 
 import numpy as np

openmc/data/neutron.py

@@ -1,5 +1,6 @@
 import sys
-from collections import OrderedDict, Iterable, Mapping, MutableMapping
+from collections import OrderedDict
+from collections.abc import Iterable, Mapping, MutableMapping
 from io import StringIO
 from itertools import chain
 from math import log10

openmc/data/product.py

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

openmc/data/reaction.py

@@ -1,4 +1,4 @@
-from collections import Iterable, Callable, MutableMapping
+from collections.abc import Iterable, Callable, MutableMapping
 from copy import deepcopy
 from numbers import Real, Integral
 from warnings import warn

openmc/data/resonance.py

@@ -1,4 +1,5 @@
-from collections import defaultdict, MutableSequence, Iterable
+from collections import defaultdict
+from collections.abc import MutableSequence, Iterable
 import io
 
 import numpy as np

openmc/data/thermal.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 from difflib import get_close_matches
 from numbers import Real
 import itertools

openmc/data/urr.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 from numbers import Integral, Real
 
 import numpy as np

openmc/executor.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 import subprocess
 from numbers import Integral
 

openmc/geometry.py

@@ -1,4 +1,5 @@
-from collections import OrderedDict, Iterable
+from collections import OrderedDict
+from collections.abc import Iterable
 from copy import deepcopy
 from xml.etree import ElementTree as ET
 

openmc/lattice.py

@@ -1,5 +1,6 @@
 from abc import ABCMeta
-from collections import OrderedDict, Iterable
+from collections import OrderedDict
+from collections.abc import Iterable
 from copy import deepcopy
 from math import sqrt, floor
 from numbers import Real, Integral

openmc/mgxs/library.py

@@ -3,7 +3,8 @@ import os
 import copy
 import pickle
 from numbers import Integral
-from collections import OrderedDict, Iterable
+from collections import OrderedDict
+from collections.abc import Iterable
 from warnings import warn
 
 import numpy as np

openmc/mgxs/mdgxs.py

@@ -1,4 +1,5 @@
-from collections import Iterable, OrderedDict
+from collections import OrderedDict
+from collections.abc import Iterable
 import itertools
 from numbers import Integral
 import warnings

openmc/model/funcs.py

@@ -1,4 +1,5 @@
-from collections import Iterable, OrderedDict
+from collections import OrderedDict
+from collections.abc import Iterable
 from math import sqrt
 from numbers import Real
 

openmc/model/model.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 
 import openmc
 from openmc.checkvalue import check_type

openmc/model/triso.py

@@ -2,7 +2,8 @@ import copy
 import warnings
 import itertools
 import random
-from collections import Iterable, defaultdict
+from collections import defaultdict
+from collections.abc import Iterable
 from numbers import Real
 from random import uniform, gauss
 from heapq import heappush, heappop

openmc/plots.py

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

openmc/region.py

@@ -1,5 +1,6 @@
 from abc import ABCMeta, abstractmethod
-from collections import Iterable, OrderedDict, MutableSequence
+from collections import OrderedDict
+from collections.abc import Iterable, MutableSequence
 from copy import deepcopy
 
 import numpy as np

openmc/search.py

@@ -1,4 +1,4 @@
-from collections import Callable
+from collections.abc import Callable
 from numbers import Real
 
 import scipy.optimize as sopt

openmc/settings.py

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

openmc/stats/multivariate.py

@@ -1,5 +1,5 @@
 from abc import ABCMeta, abstractmethod
-from collections import Iterable
+from collections.abc import Iterable
 from math import pi
 from numbers import Real
 import sys

openmc/stats/univariate.py

@@ -1,5 +1,5 @@
 from abc import ABCMeta, abstractmethod
-from collections import Iterable
+from collections.abc import Iterable
 from numbers import Real
 import sys
 from xml.etree import ElementTree as ET

openmc/summary.py

@@ -1,4 +1,4 @@
-from collections import Iterable
+from collections.abc import Iterable
 import re
 import warnings
 

openmc/tallies.py

@@ -1,4 +1,4 @@
-from collections import Iterable, MutableSequence
+from collections.abc import Iterable, MutableSequence
 import copy
 import re
 from functools import partial, reduce

openmc/trigger.py

@@ -2,7 +2,7 @@ from numbers import Real
 from xml.etree import ElementTree as ET
 import sys
 import warnings
-from collections import Iterable
+from collections.abc import Iterable
 
 import openmc.checkvalue as cv
 

openmc/volume.py

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

tests/check_source.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
+#!/usr/bin/env python3
 
 import glob
 from string import whitespace

tests/regression_tests/tally_slice_merge/test.py

@@ -1,5 +1,3 @@
-from __future__ import division
-
 import hashlib
 import itertools
 

tests/testing_harness.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 from difflib import unified_diff
 import filecmp
 import glob