RF: Purge PY2/PY3 indicators

Author: effigies

nipype/interfaces/base/core.py

@@ -43,8 +43,6 @@
 
 iflogger = logging.getLogger('nipype.interface')
 
-PY35 = sys.version_info >= (3, 5)
-PY3 = sys.version_info[0] > 2
 VALID_TERMINAL_OUTPUT = [
     'stream', 'allatonce', 'file', 'file_split', 'file_stdout', 'file_stderr',
     'none'
@@ -644,7 +642,7 @@ def save_inputs_to_json(self, json_file):
         """
         inputs = self.inputs.get_traitsfree()
         iflogger.debug('saving inputs {}', inputs)
-        with open(json_file, 'w' if PY3 else 'wb') as fhandle:
+        with open(json_file, 'w') as fhandle:
             json.dump(inputs, fhandle, indent=4, ensure_ascii=False)
 
     def _pre_run_hook(self, runtime):

nipype/pipeline/engine/utils.py

@@ -47,7 +47,6 @@
     from funcsigs import signature
 
 logger = logging.getLogger('nipype.workflow')
-PY3 = sys.version_info[0] > 2
 
 try:
     dfs_preorder = nx.dfs_preorder
@@ -1595,7 +1594,7 @@ def write_workflow_resources(graph, filename=None, append=None):
     # If we append different runs, then we will see different
     # "bursts" of timestamps corresponding to those executions.
     if append and os.path.isfile(filename):
-        with open(filename, 'r' if PY3 else 'rb') as rsf:
+        with open(filename, 'r') as rsf:
             big_dict = json.load(rsf)
 
     for _, node in enumerate(graph.nodes()):
@@ -1633,7 +1632,7 @@ def write_workflow_resources(graph, filename=None, append=None):
             big_dict['mapnode'] += [subidx] * nsamples
             big_dict['params'] += [params] * nsamples
 
-    with open(filename, 'w' if PY3 else 'wb') as rsf:
+    with open(filename, 'w') as rsf:
         json.dump(big_dict, rsf, ensure_ascii=False)
 
     return filename

nipype/pkg_info.py

@@ -6,7 +6,6 @@
 import subprocess
 
 COMMIT_INFO_FNAME = 'COMMIT_INFO.txt'
-PY3 = sys.version_info[0] >= 3
 
 
 def pkg_commit_hash(pkg_path):
@@ -61,9 +60,7 @@ def pkg_commit_hash(pkg_path):
         shell=True)
     repo_commit, _ = proc.communicate()
     if repo_commit:
-        if PY3:
-            repo_commit = repo_commit.decode()
-        return 'repository', repo_commit.strip()
+        return 'repository', repo_commit.decode().strip()
     return '(none found)', '<not found>'
 
 
@@ -82,8 +79,6 @@ def get_pkg_info(pkg_path):
     '''
     src, hsh = pkg_commit_hash(pkg_path)
     from .info import VERSION
-    if not PY3:
-        src, hsh, VERSION = src.encode(), hsh.encode(), VERSION.encode()
     import networkx
     import nibabel
     import numpy

nipype/sphinxext/plot_workflow.py

@@ -144,10 +144,6 @@ def format_template(template, **kw):
 
 
 
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-
 def _mkdirp(folder):
     """
     Equivalent to bash's mkdir -p
@@ -274,8 +270,7 @@ def setup(app):
     app.add_config_value('wf_working_directory', None, True)
     app.add_config_value('wf_template', None, True)
 
-    app.connect('doctree-read'.encode()
-                if PY2 else 'doctree-read', mark_wf_labels)
+    app.connect('doctree-read', mark_wf_labels)
 
     metadata = {'parallel_read_safe': True, 'parallel_write_safe': True}
     return metadata
@@ -456,11 +451,7 @@ def run_code(code, code_path, ns=None, function_name=None):
 
     # Redirect stdout
     stdout = sys.stdout
-    if PY3:
-        sys.stdout = io.StringIO()
-    else:
-        from cStringIO import StringIO
-        sys.stdout = StringIO()
+    sys.stdout = io.StringIO()
 
     # Assign a do-nothing print function to the namespace.  There
     # doesn't seem to be any other way to provide a way to (not) print

nipype/utils/draw_gantt_chart.py

@@ -21,8 +21,6 @@
           'install the pandas package')
     pass
 
-PY3 = sys.version_info[0] > 2
-
 
 def create_event_dict(start_time, nodes_list):
     '''
@@ -316,10 +314,7 @@ def draw_resource_bar(start_time, finish_time, time_series,
     space_between_minutes = space_between_minutes / scale
 
     # Iterate through time series
-    if PY3:
-        ts_items = time_series.items()
-    else:
-        ts_items = time_series.iteritems()
+    ts_items = time_series.items()
 
     ts_len = len(time_series)
     for idx, (ts_start, amount) in enumerate(ts_items):
@@ -555,5 +550,5 @@ def generate_gantt_chart(logfile,
     </body>'''
 
     # save file
-    with open(logfile + '.html', 'w' if PY3 else 'wb') as html_file:
+    with open(logfile + '.html', 'w') as html_file:
         html_file.write(html_string)

nipype/utils/tests/test_cmd.py

@@ -6,8 +6,6 @@
 from io import StringIO
 from ...utils import nipype_cmd
 
-PY2 = sys.version_info[0] < 3
-
 
 @contextmanager
 def capture_sys_output():
@@ -35,10 +33,6 @@ def test_main_returns_2_on_empty(self):
 nipype_cmd: error: the following arguments are required: module, interface
 """
 
-        if PY2:
-            msg = """usage: nipype_cmd [-h] module interface
-nipype_cmd: error: too few arguments
-"""
         assert stderr.getvalue() == msg
         assert stdout.getvalue() == ''
 

setup.py

@@ -22,9 +22,6 @@
 from setuptools.command.build_py import build_py
 
 
-PY3 = sys.version_info[0] >= 3
-
-
 class BuildWithCommitInfoCommand(build_py):
     """ Return extended build command class for recording commit
 
@@ -70,20 +67,14 @@ def run(self):
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE,
                                 shell=True)
-        repo_commit, _ = proc.communicate()
-        # Fix for python 3
-        if PY3:
-            repo_commit = repo_commit.decode()
+        repo_commit, _ = proc.communicate().decode()
 
         # We write the installation commit even if it's empty
         cfg_parser = configparser.RawConfigParser()
         cfg_parser.read(pjoin('nipype', 'COMMIT_INFO.txt'))
         cfg_parser.set('commit hash', 'install_hash', repo_commit.strip())
         out_pth = pjoin(self.build_lib, 'nipype', 'COMMIT_INFO.txt')
-        if PY3:
-            cfg_parser.write(open(out_pth, 'wt'))
-        else:
-            cfg_parser.write(open(out_pth, 'wb'))
+        cfg_parser.write(open(out_pth, 'wt'))
 
 
 def main():