add six

mne/beamformer/_dics.py

@@ -18,7 +18,7 @@
 from ..source_estimate import SourceEstimate
 from ..time_frequency import CrossSpectralDensity, compute_epochs_csd
 from ._lcmv import _prepare_beamformer_input
-import six
+from ..externals import six
 
 
 @verbose

mne/beamformer/_lcmv.py

@@ -21,7 +21,7 @@
 from ..source_space import label_src_vertno_sel
 from ..utils import logger, verbose
 from .. import Epochs
-import six
+from ..externals import six
 
 
 @verbose

mne/commands/mne_compute_proj_ecg.py

@@ -10,7 +10,7 @@
 # Authors : Alexandre Gramfort, Ph.D.
 #           Martin Luessi, Ph.D.
 
-from six import string_types
+from ..externals.six import string_types
 import os
 import sys
 import mne

mne/commands/mne_compute_proj_eog.py

@@ -16,7 +16,7 @@
 # Authors : Alexandre Gramfort, Ph.D.
 #           Martin Luessi, Ph.D.
 
-from six import string_types
+from ..externals.six import string_types
 import os
 import sys
 import mne

mne/connectivity/effective.py

@@ -1,7 +1,7 @@
 # Authors: Martin Luessi <[email protected]>
 #
 # License: BSD (3-clause)
-from six.moves import zip
+from ..externals.six.moves import zip
 import copy
 
 import numpy as np

mne/connectivity/spectral.py

@@ -2,7 +2,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from ..externals.six import string_types
 from warnings import warn
 from inspect import getargspec, getmembers
 

mne/coreg.py

@@ -4,7 +4,7 @@
 #
 # License: BSD (3-clause)
 
-from six.moves import configparser
+from .externals.six.moves import configparser
 import fnmatch
 from glob import glob, iglob
 import os
@@ -26,8 +26,8 @@
 from .transforms import rotation, rotation3d, scaling, translation
 from .utils import get_config, get_subjects_dir, logger, pformat
 from functools import reduce
-from six.moves import map
-from six.moves import zip
+from .externals.six.moves import map
+from .externals.six.moves import zip
 
 
 # some path templates

mne/cov.py

@@ -21,8 +21,8 @@
                         pick_channels)
 from .fiff.constants import FIFF
 from .epochs import _is_good
-from six.moves import map
-from six.moves import zip
+from .externals.six.moves import map
+from .externals.six.moves import zip
 
 
 def _check_covs_algebra(cov1, cov2):

mne/datasets/megsim/megsim.py

@@ -1,7 +1,7 @@
 # Author: Eric Larson <[email protected]>
 # License: BSD Style.
 
-from six import string_types
+from ...externals.six import string_types
 import os
 from os import path as op
 import zipfile

mne/datasets/utils.py

@@ -4,7 +4,7 @@
 #          Denis Egnemann <[email protected]>
 # License: BSD Style.
 
-from six import string_types
+from ..externals.six import string_types
 import os
 import os.path as op
 import shutil

mne/decoding/classifier.py

@@ -11,7 +11,7 @@
                       band_stop_filter)
 from ..time_frequency import multitaper_psd
 from ..fiff import pick_types
-import six
+from ..externals import six
 
 
 class Scaler(TransformerMixin):

mne/epochs.py

@@ -8,7 +8,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from .externals.six import string_types
 
 import copy as cp
 import warnings
@@ -37,7 +37,8 @@
 from .fixes import in1d
 from .viz import _mutable_defaults, plot_epochs
 from .utils import logger, verbose
-import six
+from .externals import six
+
 
 
 class _BaseEpochs(ProjMixin):

mne/event.py

@@ -6,7 +6,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from .externals.six import string_types
 import numpy as np
 from os.path import splitext
 

mne/fiff/brainvision/brainvision.py

@@ -10,8 +10,8 @@
 import time
 import re
 import warnings
-from six import StringIO, b, u
-from six.moves import configparser
+from ..externals.six import StringIO, b, u
+from ..externals.six.moves import configparser
 
 import numpy as np
 

mne/fiff/bti/raw.py

@@ -22,8 +22,7 @@
 from .transforms import (bti_identity_trans, bti_to_vv_trans,
                          bti_to_vv_coil_trans, inverse_trans, merge_trans)
 from ..meas_info import Info
-import six
-
+from ...externals import six
 
 FIFF_INFO_CHS_FIELDS = ('loc', 'ch_name', 'unit_mul', 'coil_trans',
                         'coord_frame', 'coil_type', 'range', 'unit', 'cal',

mne/fiff/edf/edf.py

@@ -21,8 +21,8 @@
 from ..constants import FIFF
 from ...coreg import get_ras_to_neuromag_trans
 from ...filter import resample
-from six.moves import map
-from six.moves import zip
+from ..externals.six.moves import map
+from ..externals.six.moves import zip
 
 
 class RawEDF(Raw):

mne/fiff/evoked.py

@@ -4,7 +4,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from ..externals.six import string_types
 from copy import deepcopy
 import numpy as np
 import warnings

mne/fiff/kit/coreg.py

@@ -5,7 +5,7 @@
 # License: BSD (3-clause)
 
 from datetime import datetime
-from six.moves import cPickle
+from ...externals.six.moves import cPickle
 import os
 from os import SEEK_CUR
 import re

mne/fiff/kit/kit.py

@@ -8,7 +8,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from ...externals.six import string_types
 import os
 from os import SEEK_CUR
 from struct import unpack

mne/fiff/meas_info.py

@@ -8,7 +8,7 @@
 import os.path as op
 import numpy as np
 from scipy import linalg
-from six import BytesIO
+from ..externals.six import BytesIO
 from datetime import datetime as dt
 
 from .open import fiff_open

mne/fiff/open.py

@@ -3,17 +3,17 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from ..externals.six import string_types
 import numpy as np
 import os.path as op
 import gzip
-from six.moves import cStringIO as StringIO
+from ..externals.six.moves import cStringIO as StringIO
 
 from .tag import read_tag_info, read_tag, read_big, Tag
 from .tree import make_dir_tree
 from .constants import FIFF
 from ..utils import logger, verbose
-import six
+from ..externals import six
 
 
 @verbose

mne/fiff/pick.py

@@ -4,7 +4,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from ..externals.six import string_types
 from copy import deepcopy
 import re
 from warnings import warn

mne/fiff/raw.py

@@ -5,7 +5,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from ..externals.six import string_types
 from math import floor, ceil
 import copy
 from copy import deepcopy
@@ -33,7 +33,7 @@
 from ..utils import (_check_fname, estimate_rank, _check_pandas_installed,
                      logger, verbose)
 from ..viz import plot_raw, plot_raw_psds, _mutable_defaults
-from six.moves import filter
+from ..externals.six.moves import filter
 
 
 class Raw(ProjMixin):

mne/fiff/tag.py

@@ -8,7 +8,7 @@
 from scipy import linalg
 import os
 import gzip
-from six import b
+from ..externals.six import b
 
 from .constants import FIFF
 

mne/fiff/write.py

@@ -3,7 +3,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types, b
+from ..externals.six import string_types, b
 import time
 import numpy as np
 from scipy import linalg

mne/filter.py

@@ -1,6 +1,6 @@
 """IIR and FIR filtering functions"""
 
-from six import string_types
+from .externals.six import string_types
 import warnings
 import numpy as np
 from scipy.fftpack import fft, ifftshift, fftfreq

mne/fixes.py

@@ -25,8 +25,8 @@
 from scipy.signal import filtfilt as sp_filtfilt
 from distutils.version import LooseVersion
 from functools import partial
-from six.moves import copyreg
-import six
+from .externals import six
+from .externals.six.moves import copyreg
 
 
 class _Counter(collections.defaultdict):

mne/forward/_make_forward.py

@@ -5,7 +5,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from ..externals.six import string_types
 import os
 from os import path as op
 import numpy as np

mne/forward/forward.py

@@ -4,7 +4,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from ..externals.six import string_types
 from time import time
 import warnings
 from copy import deepcopy

mne/gui/_coreg_gui.py

@@ -6,7 +6,7 @@
 
 from copy import deepcopy
 import os
-from six.moves import queue
+from ..externals.six.moves import queue
 import re
 from threading import Thread
 

mne/gui/_fiducials_gui.py

@@ -6,8 +6,8 @@
 
 from glob import glob
 import os
-from six.moves import map
-from six.moves import zip
+from ..externals.six.moves import map
+from ..externals.six.moves import zip
 
 # allow import without traits
 try:

mne/gui/_file_traits.py

@@ -7,8 +7,8 @@
 import os
 
 import numpy as np
-from six.moves import map
-from six.moves import zip
+from ..externals.six.moves import map
+from ..externals.six.moves import zip
 
 # allow import without traits
 try:

mne/gui/_kit2fiff_gui.py

@@ -5,7 +5,7 @@
 # License: BSD (3-clause)
 
 import os
-from six.moves import queue
+from ..externals.six.moves import queue
 from threading import Thread
 
 import numpy as np

mne/gui/tests/test_coreg_gui.py

@@ -2,7 +2,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from ..externals.six import string_types
 import os
 
 import numpy as np

mne/label.py

@@ -4,7 +4,7 @@
 #
 # License: BSD (3-clause)
 
-from six import string_types
+from .externals.six import string_types
 from os import path as op
 import os
 import copy as cp

mne/layouts/layout.py

@@ -13,8 +13,8 @@
 from ..preprocessing.maxfilter import fit_sphere_to_headshape
 from ..fiff import FIFF, pick_types
 from ..utils import _clean_names
-from six.moves import map
-from six.moves import zip
+from ..externals.six.moves import map
+from ..externals.six.moves import zip
 
 
 class Layout(object):

mne/minimum_norm/tests/test_inverse.py

@@ -19,7 +19,7 @@
                                       write_inverse_operator,
                                       compute_rank_inverse)
 from mne.utils import _TempDir
-import six
+from ..externals import six
 
 s_path = op.join(sample.data_path(download=False), 'MEG', 'sample')
 fname_inv = op.join(s_path, 'sample_audvis-meg-oct-6-meg-inv.fif')

mne/minimum_norm/time_frequency.py

@@ -19,7 +19,7 @@
                       _check_ori, _subject_from_inverse)
 from ..parallel import parallel_func
 from ..utils import logger, verbose
-import six
+from ..externals import six
 
 
 @verbose