Python 3 migration of PyHEADTAIL v1.13.5

Author: lmether

PyHEADTAIL/__init__.py

@@ -22,7 +22,7 @@
     from ._version import __version__
     dirty = False
 
-print ('PyHEADTAIL v' + __version__)
+print(('PyHEADTAIL v' + __version__))
 if dirty:
     print ('(dirty git work tree)')
 print ('\n')

PyHEADTAIL/aperture/aperture.py

@@ -10,7 +10,7 @@
          Michael Schenk
 '''
 
-from __future__ import division
+
 
 import numpy as np
 from abc import ABCMeta, abstractmethod
@@ -23,15 +23,13 @@ def make_int32(array):
     return array.astype(np.int32)
 
 
-class Aperture(Element):
+class Aperture(Element, metaclass=ABCMeta):
     '''Abstract base class for Aperture elements. An aperture is
     generally defined as a condition on the phase space coordinates.
     Particles not fulfilling this condition are tagged as lost and
     are removed from the beam directly after.
     '''
 
-    __metaclass__ = ABCMeta
-
     @clean_slices
     def track(self, beam):
         '''Tag particles not passing through the aperture as lost. If

PyHEADTAIL/cobra_functions/curve_tools.py

@@ -1,4 +1,4 @@
-from __future__ import division
+
 
 import numpy as np
 from scipy.optimize import brentq
@@ -20,4 +20,4 @@ def extrema(x, y=None):
     zix = np.where(np.abs(np.diff(np.sign(np.diff(x)))) == 2)[0]
     return zix
     if not y:
-        print zix
+        print(zix)

PyHEADTAIL/feedback/transverse_damper.py

@@ -4,7 +4,7 @@
 @copyright CERN
 '''
 
-from __future__ import division
+
 
 import numpy as np
 from scipy.special import k0

PyHEADTAIL/feedback/widebandfeedback.py

@@ -4,7 +4,7 @@
 @copyright CERN
 '''
 
-from __future__ import division
+
 
 import numpy as np
 from scipy.special import k0

PyHEADTAIL/field_maps/Transverse_Efield_map.py

@@ -36,7 +36,7 @@ def track(self, beam):
 
         slices = beam.get_slices(self.slicer)
 
-        for sid in xrange(slices.n_slices-1, -1, -1):
+        for sid in range(slices.n_slices-1, -1, -1):
 
             # select particles in the slice
             pid = slices.particle_indices_of_slice(sid)

PyHEADTAIL/field_maps/field_map.py

@@ -15,7 +15,7 @@
 @date:    13.06.2017
 '''
 
-from __future__ import division, print_function
+
 
 from scipy.constants import c
 
@@ -82,7 +82,7 @@ def __init__(self, length, mesh, fields, wrt_beam_centroid=False,
             poissonsolver=None,
             gradient=lambda *args, **kwargs: None,
             mesh=mesh)
-        self.fields = map(pm.ensure_same_device, fields)
+        self.fields = list(map(pm.ensure_same_device, fields))
         self.wrt_beam_centroid = wrt_beam_centroid
 
     def track(self, beam):
@@ -94,7 +94,7 @@ def track(self, beam):
                      beam.y - my,
                      beam.z - mz] # zip will cut to #fields
 
-        mesh_fields_and_mp_coords = zip(self.fields, mp_coords)
+        mesh_fields_and_mp_coords = list(zip(self.fields, mp_coords))
 
         # electric fields at each particle position in lab frame [V/m]
         part_fields = self.pypic.field_to_particles(*mesh_fields_and_mp_coords)
@@ -149,7 +149,7 @@ def __init__(self, slicer, *args, **kwargs):
         # require 2D!
         assert self.pypic.mesh.dimension == 2, \
             'mesh needs to be two-dimensional!'
-        assert all(map(lambda f: f.ndim == 2, self.fields)), \
+        assert all([f.ndim == 2 for f in self.fields]), \
             'transverse field components need to be two-dimensional arrays!'
         #
 
@@ -167,7 +167,7 @@ def track(self, beam):
         mp_coords = [beam.x - mx,
                      beam.y - my,
                      beam.z] # zip will cut to #fields
-        mesh_fields_and_mp_coords = zip(self.fields, mp_coords)
+        mesh_fields_and_mp_coords = list(zip(self.fields, mp_coords))
 
         # electric fields at each particle position in lab frame [V/m]
         part_fields = self.pypic.field_to_particles(*mesh_fields_and_mp_coords)

PyHEADTAIL/general/decorators.py

@@ -26,7 +26,7 @@ def deprecated_wrapper(*args, **kwargs):
                           'PyHEADTAIL release!'.format(name),
                           category=DeprecationWarning, stacklevel=2)
             warnings.simplefilter('default', DeprecationWarning)
-            print message
+            print(message)
             return func(*args, **kwargs)
         return deprecated_wrapper
     return deprecated_decorator
@@ -41,7 +41,7 @@ def memoize(function):
     @wraps(function)
     def evaluate(*args):
         signature = (args)
-        if not store.has_key(signature):
+        if signature not in store:
             store[signature] = function(*args)
         return store[signature]
     return evaluate

PyHEADTAIL/general/element.py

@@ -71,12 +71,11 @@ def warns(self, output):
         self._warningprinter.prints("*** PyHEADTAIL WARNING! " + output)
 
 
-class Element(Printing):
+class Element(Printing, metaclass=ABCMeta):
     '''
     Abstract element as part of the tracking layout. Guarantees
     to fulfil its tracking contract via the method track(beam).
     '''
-    __metaclass__ = ABCMeta
 
     @abstractmethod
     def track(self, beam):

PyHEADTAIL/general/pmath.py

@@ -331,8 +331,8 @@ def update_active_dict(new_dict):
     if not hasattr(update_active_dict, 'active_dict'):
         update_active_dict.active_dict = new_dict
     # delete all old implementations/references from globals()
-    for key in globals().keys():
-        if key in update_active_dict.active_dict.keys():
+    for key in list(globals().keys()):
+        if key in list(update_active_dict.active_dict.keys()):
             del globals()[key]
     # add the new active dict to the globals()
     globals().update(new_dict)