Merge pull request #163 from scottclowe/rf_tidy-up

RF: Tidy up

fissa/ROI.py

@@ -21,7 +21,6 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from builtins import filter
 from itertools import product
 # from warnings import warn
 

fissa/core.py

@@ -10,6 +10,7 @@
 
 import collections
 import glob
+from multiprocessing import Pool
 import os.path
 import sys
 import warnings
@@ -22,15 +23,6 @@
 from . import neuropil as npil
 from . import roitools
 
-try:
-    from multiprocessing import Pool
-    has_multiprocessing = True
-except ImportError:
-    warnings.warn('Multiprocessing library is not installed, using single ' +
-                  'core instead. To use multiprocessing install it by: ' +
-                  'pip install multiprocessing')
-    has_multiprocessing = False
-
 
 def extract_func(inputs):
     """Extract data using multiprocessing.
@@ -306,7 +298,6 @@ def separation_prep(self, redo=False):
 
             # Check whether we should use multiprocessing
             use_multiprocessing = (
-                has_multiprocessing and
                 (self.ncores_preparation is None or self.ncores_preparation > 1)
             )
             # Do the extraction
@@ -437,7 +428,6 @@ def separate(self, redo_prep=False, redo_sep=False):
 
             # Check whether we should use multiprocessing
             use_multiprocessing = (
-                has_multiprocessing and
                 (self.ncores_separation is None or self.ncores_separation > 1)
             )
             # Do the extraction

fissa/readimagejrois.py

@@ -14,9 +14,6 @@
 from __future__ import unicode_literals
 from past.builtins import basestring
 
-from builtins import str
-from builtins import range
-
 import sys
 from itertools import product
 

fissa/roitools.py

@@ -6,8 +6,6 @@
 
 from __future__ import division
 
-from builtins import range
-
 import numpy as np
 from skimage.measure import find_contours
 

fissa/tests/test_datahandler.py

@@ -46,7 +46,7 @@ def setup_class(self):
 
     def test_imagej_zip(self):
         # load zip of rois
-        ROI_loc = 'fissa/tests/resources/RoiSet.zip'
+        ROI_loc = os.path.join(self.test_directory, 'resources', 'RoiSet.zip')
         actual = datahandler.rois2masks(ROI_loc, self.data)
 
         # assert equality

fissa/tests/test_datahandler_framebyframe.py

@@ -42,7 +42,7 @@ def setup_class(self):
 
     def test_imagej_zip(self):
         # load zip of rois
-        ROI_loc = 'fissa/tests/resources/RoiSet.zip'
+        ROI_loc = os.path.join(self.test_directory, 'resources', 'RoiSet.zip')
         actual = datahandler.rois2masks(ROI_loc, self.data)
 
         # assert equality