RF: Drop various remaining compatibilities for Python < 3.5

Author: effigies

nipype/info.py

@@ -2,7 +2,6 @@
 settings in setup.py, the nipy top-level docstring, and for building the
 docs.  In setup.py in particular, we exec this file, so it cannot import nipy
 """
-import sys
 
 # nipype version information.  An empty version_extra corresponds to a
 # full release.  '.dev' as a version_extra string means this is a development
@@ -152,9 +151,6 @@ def get_nipype_gitversion():
     'futures; python_version == "2.7"',
 ]
 
-if sys.version_info <= (3, 4):
-    REQUIRES.append('configparser')
-
 TESTS_REQUIRES = ['pytest-cov', 'codecov', 'pytest-env', 'coverage<5']
 
 EXTRA_REQUIRES = {

nipype/interfaces/tests/test_io.py

@@ -5,9 +5,7 @@
 import copy
 import simplejson
 import glob
-import shutil
 import os.path as op
-import sys
 from subprocess import Popen
 import hashlib
 from collections import namedtuple
@@ -577,8 +575,6 @@ def test_jsonsink(tmpdir, inputs_attributes):
 # There are three reasons these tests will be skipped:
 @pytest.mark.skipif(not have_pybids,
                     reason="Pybids is not installed")
-@pytest.mark.skipif(sys.version_info < (3, 0),
-                    reason="Pybids no longer supports Python 2")
 @pytest.mark.skipif(not dist_is_editable('pybids'),
                     reason="Pybids is not installed in editable mode")
 def test_bids_grabber(tmpdir):
@@ -594,8 +590,6 @@ def test_bids_grabber(tmpdir):
 
 @pytest.mark.skipif(not have_pybids,
                     reason="Pybids is not installed")
-@pytest.mark.skipif(sys.version_info < (3, 0),
-                    reason="Pybids no longer supports Python 2")
 @pytest.mark.skipif(not dist_is_editable('pybids'),
                     reason="Pybids is not installed in editable mode")
 def test_bids_fields(tmpdir):
@@ -610,8 +604,6 @@ def test_bids_fields(tmpdir):
 
 @pytest.mark.skipif(not have_pybids,
                     reason="Pybids is not installed")
-@pytest.mark.skipif(sys.version_info < (3, 0),
-                    reason="Pybids no longer supports Python 2")
 @pytest.mark.skipif(not dist_is_editable('pybids'),
                     reason="Pybids is not installed in editable mode")
 def test_bids_infields_outfields(tmpdir):

nipype/pipeline/engine/tests/test_utils.py

@@ -4,7 +4,6 @@
 """Tests for the engine utils module
 """
 import os
-import sys
 from copy import deepcopy
 import pytest
 
@@ -159,8 +158,6 @@ def dummy_func(value):
     return value + 1
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 0), reason="the famous segfault #1788")
 def test_mapnode_crash(tmpdir):
     """Test mapnode crash when stop_on_first_crash is True"""
     cwd = os.getcwd()
@@ -180,8 +177,6 @@ def test_mapnode_crash(tmpdir):
     os.chdir(cwd)
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 0), reason="the famous segfault #1788")
 def test_mapnode_crash2(tmpdir):
     """Test mapnode crash when stop_on_first_crash is False"""
     cwd = os.getcwd()
@@ -200,8 +195,6 @@ def test_mapnode_crash2(tmpdir):
     os.chdir(cwd)
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 0), reason="the famous segfault #1788")
 def test_mapnode_crash3(tmpdir):
     """Test mapnode crash when mapnode is embedded in a workflow"""
     tmpdir.chdir()

nipype/pipeline/plugins/tools.py

@@ -115,8 +115,7 @@ def create_pyscript(node, updatehash=False, store_exception=True):
 batchdir = '%s'
 from nipype.utils.filemanip import loadpkl, savepkl
 try:
-    if not sys.version_info < (2, 7):
-        from collections import OrderedDict
+    from collections import OrderedDict
     config_dict=%s
     config.update_config(config_dict)
     ## Only configure matplotlib if it was successfully imported,

nipype/sphinxext/plot_workflow.py

@@ -144,23 +144,6 @@ def format_template(template, **kw):
 
 
 
-def _mkdirp(folder):
-    """
-    Equivalent to bash's mkdir -p
-    """
-    if sys.version_info > (3, 4, 1):
-        os.makedirs(folder, exist_ok=True)
-        return folder
-
-    try:
-        os.makedirs(folder)
-    except OSError as exc:
-        if exc.errno != EEXIST or not os.path.isdir(folder):
-            raise
-
-    return folder
-
-
 def wf_directive(name, arguments, options, content, lineno, content_offset,
                  block_text, state, state_machine):
     if len(missing_imports) == 0:
@@ -737,7 +720,7 @@ def run(arguments, content, options, state_machine, state, lineno):
         state_machine.insert_input(total_lines, source=source_file_name)
 
     # copy image files to builder's output directory, if necessary
-    _mkdirp(dest_dir)
+    os.makedirs(dest_dir, exist_ok=True)
     for code_piece, images in results:
         for img in images:
             for fn in img.filenames():

nipype/utils/filemanip.py

@@ -91,56 +91,7 @@ def to_str(value):
     Manipulates ordered dicts before they are hashed (Py2/3 compat.)
 
     """
-    if sys.version_info[0] > 2:
-        retval = str(value)
-    else:
-        retval = to_str_py27(value)
-    return retval
-
-
-def to_str_py27(value):
-    """
-    Encode dictionary for python 2
-    """
-
-    if isinstance(value, dict):
-        entry = '{}: {}'.format
-        retval = '{'
-        for key, val in list(value.items()):
-            if len(retval) > 1:
-                retval += ', '
-            kenc = repr(key)
-            if kenc.startswith(("u'", 'u"')):
-                kenc = kenc[1:]
-            venc = to_str_py27(val)
-            if venc.startswith(("u'", 'u"')):
-                venc = venc[1:]
-            retval += entry(kenc, venc)
-        retval += '}'
-        return retval
-
-    istuple = isinstance(value, tuple)
-    if isinstance(value, (tuple, list)):
-        retval = '(' if istuple else '['
-        nels = len(value)
-        for i, v in enumerate(value):
-            venc = to_str_py27(v)
-            if venc.startswith(("u'", 'u"')):
-                venc = venc[1:]
-            retval += venc
-
-            if i < nels - 1:
-                retval += ', '
-
-        if istuple and nels == 1:
-            retval += ','
-        retval += ')' if istuple else ']'
-        return retval
-
-    retval = repr(value).decode()
-    if retval.startswith(("u'", 'u"')):
-        retval = retval[1:]
-    return retval
+    return str(value)
 
 
 def fname_presuffix(fname, prefix='', suffix='', newpath=None, use_ext=True):
@@ -593,8 +544,6 @@ def save_json(filename, data):
 
     """
     mode = 'w'
-    if sys.version_info[0] < 3:
-        mode = 'wb'
     with open(filename, mode) as fp:
         json.dump(data, fp, sort_keys=True, indent=4)
 
@@ -841,27 +790,10 @@ def which(cmd, env=None, pathext=None):
     if env and 'PATH' in env:
         path = env.get("PATH")
 
-    if sys.version_info >= (3, 3):
-        for ext in pathext:
-            filename = shutil.which(cmd + ext, path=path)
-            if filename:
-                return filename
-        return None
-
-    def isexec(path):
-        return os.path.isfile(path) and os.access(path, os.X_OK)
-
     for ext in pathext:
-        extcmd = cmd + ext
-        fpath, fname = os.path.split(extcmd)
-        if fpath:
-            if isexec(extcmd):
-                return extcmd
-        else:
-            for directory in path.split(os.pathsep):
-                filename = op.join(directory, extcmd)
-                if isexec(filename):
-                    return filename
+        filename = shutil.which(cmd + ext, path=path)
+        if filename:
+            return filename
     return None
 
 

nipype/utils/tests/test_functions.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
 import pytest
 from nipype.utils.functions import (getsource, create_function_from_source)
 
@@ -27,7 +26,7 @@ def test_func_to_str_err():
 
 def _print_statement():
     try:
-        exec('print ""')
+        exec('print("")')
         return True
     except SyntaxError:
         return False
@@ -41,7 +40,6 @@ def is_string():
     assert is_string() == wrapped_func()
 
 
-@pytest.mark.skipif(sys.version_info[0] > 2, reason="breaks python 3")
-def test_func_print_py2():
+def test_func_print():
     wrapped_func = create_function_from_source(getsource(_print_statement))
     assert wrapped_func()