Merge pull request #22 from francesco-ballarin/master

python 3 compatibility for DofMapPlotter class

fenicstools/DofMapPlotter.py

@@ -86,7 +86,7 @@ def plot(self, component=[], sub=None, order='global'):
             # Convert component to list if necessary and perform validity check
             component = component if type(component) is list else [component]
             # If component is empty plot all dofmaps
-            component = component if component else range(self.num_dofmaps())
+            component = component if component else list(range(self.num_dofmaps()))
             if not self._arg_check(component):
                 raise ValueError('Component is not list or in [0, %d)' %
                                  self.num_dofmaps())
@@ -99,7 +99,7 @@ def plot(self, component=[], sub=None, order='global'):
             assert (0 <= sub < self.num_subspaces()) and (type(sub) is int)
 
             # Compute component of subspace
-            sub_component = range(self.bounds[sub], self.bounds[sub+1])
+            sub_component = list(range(self.bounds[sub], self.bounds[sub+1]))
 
             # Plot
             self.plot(component=sub_component, sub=None, order=order)

fenicstools/dofmapplotter/common.py

@@ -149,7 +149,7 @@ def bounds(V):
         signature_ = V
     signature_ = flat_signature(signature_)
     trans = lambda x: x if x else x + 1
-    signature_ = map(trans, signature_)
+    signature_ = list(map(trans, signature_))
     limits = partial_sum(signature_)
     limits = [0] + limits
 

fenicstools/dofmapplotter/dofhandler.py

@@ -83,7 +83,7 @@ def _dof_plot(self, event):
         elif (event.key == 'D') and not self.showing_all_dofs:
             start = time.time()
             self.printer('Processing ...', 'blue')
-            cell_indices = xrange(self.mesh.num_cells())
+            cell_indices = range(self.mesh.num_cells())
             for cell_index in cell_indices:
                 self._cell_dof_plot(cell_index)
             self.fig.canvas.draw()

fenicstools/dofmapplotter/meshentityhandler.py

@@ -89,7 +89,7 @@ def _mesh_entity_plot(self, event, local_key, global_key, tdim):
         elif pressed_gc and not self.showing_all_mesh_entities[tdim]:
             start = time.time()
             self.printer('Processing ...', 'blue')
-            cell_indices = xrange(self.mesh.num_cells())
+            cell_indices = range(self.mesh.num_cells())
 
             for cell_index in cell_indices:
                 self._single_mesh_entity_plot(cell_index, tdim)