Remove more Python 2 compatibility, relates #1092

modules/EMageFit/bin/emagefit

@@ -1,24 +1,11 @@
 #!/usr/bin/env python
 
-try:
-    from configparser import ConfigParser # python3
-except ImportError:
-    from ConfigParser import SafeConfigParser as ConfigParser # python2
+from configparser import ConfigParser
 import sys
 import os
 import time
 import logging
-try:
-    # Python 3
-    from importlib.machinery import SourceFileLoader
-except ImportError:
-    # Python 2
-    class SourceFileLoader(object):
-        def __init__(self, name, path):
-            self.name, self.path = name, path
-        def load_module(self):
-            import imp
-            return imp.load_source(self.name, self.path)
+from importlib.machinery import SourceFileLoader
 
 log = logging.getLogger("domino_model")
 

modules/EMageFit/pyext/src/buildxlinks.py

@@ -7,13 +7,8 @@
 import IMP.algebra as alg
 import IMP.core as core
 import logging
-
 import networkx as nx
 
-try:
-    set = set
-except NameError:
-    from sets import Set as set
 
 log = logging.getLogger("buildxlinks")
 

modules/EMageFit/pyext/src/utility.py

@@ -43,17 +43,10 @@ def get_experiment_params(fn_params):
         @param fn_params configuration file
         @return Experiment Class with all the information from the config file
     """
-    try:
-        import importlib.machinery
-        imp = None
-    except ImportError:
-        import imp
+    import importlib.machinery
     name, ext = os.path.splitext(fn_params)
-    if imp is None:
-        foo = importlib.machinery.SourceFileLoader(name,
-                                                   fn_params).load_module()
-    else:
-        foo = imp.load_source(name, fn_params)
+    foo = importlib.machinery.SourceFileLoader(name,
+                                               fn_params).load_module()
     exp = foo.Experiment()
     # convert to absolute paths
     exp.fn_pdbs = [IMP.get_relative_path(fn_params, fn) for fn in exp.fn_pdbs]

modules/isd/data/gen_dict.py

@@ -1,9 +1,6 @@
 #!/usr/bin/env python
 
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 
 di = {'ALA': {'HB': ('HB1', 'HB2', 'HB3'),
               'HB%': ('HB1', 'HB2', 'HB3'),

modules/isd/pyext/src/utils.py

@@ -357,10 +357,7 @@ def Dump(this, filename, gzip=0, mode='w', bin=1):
     """
 
     import os
-    try:
-        import cPickle as pickle
-    except ImportError:
-        import pickle
+    import pickle
 
     filename = os.path.expanduser(filename)
 

modules/kernel/pyext/include/IMP_kernel.decorators.i

@@ -9,7 +9,4 @@
   bool __bool__() {
     return self->get_is_valid();
   }
-  %pythoncode %{
-    __nonzero__ = __bool__
-  %}
 }

modules/kernel/pyext/src/_list_util.py

@@ -25,9 +25,6 @@ def __next__(self):
             raise StopIteration
         return self.__getfunc(self.__n)
 
-    # Python 2
-    next = __next__
-
 
 class VarList(object):
     """A list-like object that wraps IMP C++ object accessor methods"""

modules/parallel/pyext/src/__init__.py

@@ -5,10 +5,7 @@
 import re
 import random
 import struct
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 import IMP
 from IMP.parallel import workerstate
 from IMP.parallel.subproc import _run_background, _Popen4

modules/parallel/test/test_tasks.py

@@ -40,14 +40,8 @@ def test_floats(self):
         m.add_worker(IMP.parallel.LocalWorker())
         c = m.get_context()
 
-        try:
-            inf = float('inf')
-            nan = float('nan')
-        except ValueError:
-            # Python 2.5 on Windows reports 'invalid literal', so use another
-            # method to get inf and nan:
-            inf = 1e300 * 1e300
-            nan = inf - inf
+        inf = float('inf')
+        nan = float('nan')
         for f in (inf, nan):
             c.add_task(_tasks.SimpleTask(f))
         results = list(c.get_results_unordered())

modules/test/pyext/src/__init__.py

@@ -990,18 +990,11 @@ def import_python_application(self, app):
         """Import an installed Python application, rather than running it.
            This is useful to directly test components of the application.
            @return the Python module object."""
-        try:
-            import importlib.machinery
-            imp = None
-        except ImportError:
-            import imp
+        import importlib.machinery
         name = os.path.splitext(app)[0]
         pathname = os.path.join(os.environ['IMP_BIN_DIR'], app)
-        if imp is None:
-            return importlib.machinery.SourceFileLoader(name,
-                                                        pathname).load_module()
-        else:
-            return imp.load_source(name, pathname)
+        return importlib.machinery.SourceFileLoader(name,
+                                                    pathname).load_module()
 
     def run_script(self, app, args):
         """Run an application with the given list of arguments.