Fixed merge conflicts with develop

openmc/filter.py

@@ -150,7 +150,7 @@ class Filter(object):
             raise ValueError(msg)
 
         # If the bin edge is a single value, it is a Cell, Material, etc. ID
-        if not isinstance(bins, Iterable):
+        if not cv._isinstance(bins, Iterable):
             bins = [bins]
 
         # If the bins are in a collection, convert it to a list
@@ -165,7 +165,7 @@ class Filter(object):
 
         elif self.type in ['energy', 'energyout']:
             for edge in bins:
-                if not isinstance(edge, Real):
+                if not cv._isinstance(edge, Real):
                     msg = 'Unable to add bin edge "{0}" to a "{1}" Filter ' \
                           'since it is a non-integer or floating point ' \
                           'value'.format(edge, self.type)
@@ -189,7 +189,7 @@ class Filter(object):
                 msg = 'Unable to add bins "{0}" to a mesh Filter since ' \
                       'only a single mesh can be used per tally'.format(bins)
                 raise ValueError(msg)
-            elif not isinstance(bins[0], Integral):
+            elif not cv._isinstance(bins[0], Integral):
                 msg = 'Unable to add bin "{0}" to mesh Filter since it ' \
                        'is a non-integer'.format(bins[0])
                 raise ValueError(msg)

tests/test_entropy/test_entropy.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 

tests/test_filter_distribcell/test_filter_distribcell.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 
+import glob
 import hashlib
+import os
 import sys
 
 sys.path.insert(0, '..')

tests/test_fixed_source/test_fixed_source.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 

tests/test_output/test_output.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 

tests/test_source_file/test_source_file.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 

tests/test_sourcepoint_batch/test_sourcepoint_batch.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 

tests/test_sourcepoint_interval/test_sourcepoint_interval.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 

tests/test_sourcepoint_latest/test_sourcepoint_latest.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 

tests/test_statepoint_restart/test_statepoint_restart.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 

tests/test_statepoint_sourcesep/test_statepoint_sourcesep.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import sys
+
 sys.path.insert(0, '..')
 from testing_harness import *
 
@@ -15,6 +18,13 @@ class SourcepointTestHarness(TestHarness):
         assert source[0].endswith('h5'), \
              'Source file is not a HDF5 file.'
 
+    def _cleanup(self):
+        TestHarness._cleanup(self)
+        output = glob.glob(os.path.join(os.getcwd(), 'source.*'))
+        for f in output:
+            if os.path.exists(f):
+                os.remove(f)
+
 
 if __name__ == '__main__':
     harness = SourcepointTestHarness('statepoint.10.*')

tests/test_track_output/test_track_output.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+import glob
+import os
 import shutil
 import sys