FIX: Fixes

mne/epochs.py

@@ -707,7 +707,7 @@ def __init__(self, raw, events, event_id, tmin, tmax, baseline=(None, 0),
                 if on_missing == 'error':
                     raise ValueError(msg)
                 elif on_missing == 'warning':
-                    logger.warn(msg)
+                    logger.warning(msg)
                     warnings.warn(msg)
                 else:  # on_missing == 'ignore':
                     pass

mne/preprocessing/tests/test_ica.py

@@ -485,7 +485,8 @@ def test_ica_reject_buffer():
         ica.fit(raw, picks[:5], reject=dict(mag=2.5e-12), decim=2,
             tstep=0.01, verbose=True)
     assert_true(raw._data[:5, ::2].shape[1] - 4 == ica.n_samples_)
-    log = [l for l in open(drop_log) if 'detected' in l]
+    with open(drop_log) as fid:
+        log = [l for l in fid if 'detected' in l]
     assert_equal(len(log), 1)
 
 

mne/source_space.py

@@ -854,7 +854,7 @@ def setup_source_space(subject, fname=True, spacing='oct6', surface='white',
                "defaults to False, but the default will change to True in "
                "release 0.9. Specify the parameter explicitly to avoid this "
                "warning.")
-        logger.warn(msg)
+        logger.warning(msg)
 
     cmd = ('setup_source_space(%s, fname=%s, spacing=%s, surface=%s, '
            'overwrite=%s, subjects_dir=%s, add_dist=%s, verbose=%s)'

mne/utils.py

@@ -41,6 +41,14 @@
 ###############################################################################
 # RANDOM UTILITIES
 
+def _sort_keys(x):
+    """Sort and return keys of dict"""
+    keys = list(x.keys())  # note: not thread-safe
+    idx = np.argsort([str(k) for k in keys])
+    keys = [keys[ii] for ii in idx]
+    return keys
+
+
 def object_hash(x, h=None):
     """Hash a reasonable python object
 
@@ -60,9 +68,7 @@ def object_hash(x, h=None):
     if h is None:
         h = hashlib.md5()
     if isinstance(x, dict):
-        keys = list(x.keys())  # note: not thread-safe
-        idx = np.argsort([str(k) for k in keys])
-        keys = [keys[ii] for ii in idx]
+        keys = _sort_keys(x)
         for key in keys:
             object_hash(key, h)
             object_hash(x[key], h)
@@ -106,8 +112,8 @@ def object_diff(a, b, pre=''):
     if type(a) != type(b):
         out += pre + ' type mismatch (%s, %s)\n' % (type(a), type(b))
     elif isinstance(a, dict):
-        k1s = sorted(a.keys())
-        k2s = sorted(b.keys())
+        k1s = _sort_keys(a)
+        k2s = _sort_keys(b)
         m1 = set(k2s) - set(k1s)
         if len(m1):
             out += pre + ' x1 missing keys %s\n' % (m1)
@@ -1331,6 +1337,7 @@ def _chunk_read_ftp_resume(url, temp_file_name, local_file):
     # chunk and will write it to file and update the progress bar
     chunk_write = lambda chunk: _chunk_write(chunk, local_file, progress)
     data.retrbinary(down_cmd, chunk_write)
+    data.close()
 
 
 def _chunk_write(chunk, local_file, progress):