Merge pull request #1486 from zm711/tidy-up

Clean-up unused imports and standardized order

Author: samuelgarcia

neo/core/analogsignal.py

@@ -18,21 +18,13 @@
 """
 
 import logging
-
-try:
-    import scipy.signal
-except ImportError as err:
-    HAVE_SCIPY = False
-else:
-    HAVE_SCIPY = True
+from copy import deepcopy
 
 import numpy as np
 import quantities as pq
 
 from neo.core.baseneo import BaseNeo, MergeError, merge_annotations, intersect_annotations
 from neo.core.dataobject import DataObject
-from copy import copy, deepcopy
-
 from neo.core.basesignal import BaseSignal
 
 logger = logging.getLogger("Neo")
@@ -612,8 +604,9 @@ def downsample(self, downsampling_factor, **kwargs):
         -----
         For resampling the signal with a fixed number of samples, see `resample` method.
         """
-
-        if not HAVE_SCIPY:
+        try:
+            import scipy.signal
+        except ImportError as err:
             raise ImportError("Decimating requires availability of scipy.signal")
 
         # Resampling is only permitted along the time axis (axis=0)
@@ -655,8 +648,10 @@ def resample(self, sample_count, **kwargs):
         For reducing the number of samples to a fraction of the original, see `downsample` method
         """
 
-        if not HAVE_SCIPY:
-            raise ImportError("Resampling requires availability of scipy.signal")
+        try:
+            import scipy.signal
+        except ImportError as err:
+            raise ImportError("Decimating requires availability of scipy.signal")
 
         # Resampling is only permitted along the time axis (axis=0)
         if "axis" in kwargs:

neo/core/basesignal.py

@@ -14,7 +14,6 @@
 can be created.
 """
 
-import copy
 import logging
 from copy import deepcopy
 
@@ -123,7 +122,7 @@ def _apply_operator(self, other, op, *args):
         new_signal._copy_data_complement(self)
         # _copy_data_complement can't always copy array annotations,
         # so this needs to be done locally
-        new_signal.array_annotations = copy.deepcopy(self.array_annotations)
+        new_signal.array_annotations = deepcopy(self.array_annotations)
         return new_signal
 
     def _get_required_attributes(self, signal, units):

neo/core/dataobject.py

@@ -10,6 +10,7 @@
 
 import quantities as pq
 import numpy as np
+
 from neo.core.baseneo import BaseNeo, _check_annotations
 
 

neo/core/epoch.py

@@ -5,7 +5,7 @@
 :module:`neo.core.baseneo`.
 """
 
-from copy import deepcopy, copy
+from copy import deepcopy
 from numbers import Number
 
 import numpy as np

neo/core/event.py

@@ -5,7 +5,7 @@
 :module:`neo.core.baseneo`.
 """
 
-from copy import deepcopy, copy
+from copy import deepcopy
 
 import numpy as np
 import quantities as pq

neo/core/group.py

@@ -6,7 +6,6 @@
 and :class:`Unit`.
 """
 
-from os import close
 from neo.core.container import Container
 from neo.core.analogsignal import AnalogSignal
 from neo.core.container import Container

neo/core/imagesequence.py

@@ -17,9 +17,11 @@
 the old object.
 """
 
-from neo.core.analogsignal import AnalogSignal, _get_sampling_rate
+
 import quantities as pq
 import numpy as np
+
+from neo.core.analogsignal import AnalogSignal, _get_sampling_rate
 from neo.core.baseneo import BaseNeo
 from neo.core.basesignal import BaseSignal
 from neo.core.dataobject import DataObject

neo/core/irregularlysampledsignal.py

@@ -19,14 +19,8 @@
 the old object.
 """
 
-from copy import deepcopy, copy
+from copy import deepcopy
 
-try:
-    import scipy.signal
-except ImportError as err:
-    HAVE_SCIPY = False
-else:
-    HAVE_SCIPY = True
 
 import numpy as np
 import quantities as pq
@@ -457,7 +451,9 @@ def resample(self, sample_count, **kwargs):
             The original :class:`AnalogSignal` is not modified.
         """
 
-        if not HAVE_SCIPY:
+        try:
+            import scipy.signal
+        except ImportError:
             raise ImportError("Resampling requires availability of scipy.signal")
 
         # Resampling is only permitted along the time axis (axis=0)

neo/core/objectlist.py

@@ -4,6 +4,7 @@
 """
 
 import sys
+
 from neo.core.baseneo import BaseNeo
 
 

neo/core/segment.py

@@ -9,8 +9,6 @@
 from datetime import datetime
 from copy import deepcopy
 
-import numpy as np
-
 
 from neo.core.analogsignal import AnalogSignal
 from neo.core.container import Container