Merge pull request #711 from ketch/no_py2

Drop support for Python 2, removing imports of six and __future__.

Author: mandli

examples/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from .advection_1d import advection_1d
 from .acoustics_1d_homogeneous import acoustics_1d
 from .acoustics_2d_homogeneous import acoustics_2d

examples/acoustics_1d_homogeneous/acoustics_1d.py

@@ -18,7 +18,6 @@
 The final solution is identical to the initial data because both waves have
 crossed the domain exactly once.
 """
-from __future__ import absolute_import
 from numpy import sqrt, exp, cos
 from clawpack import riemann
 

examples/acoustics_1d_homogeneous/test_acoustics.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 
 def test_1d_acoustics():
     """test_1d_acoustics

examples/acoustics_2d_homogeneous/acoustics_2d.py

@@ -14,7 +14,6 @@
 Here p is the pressure, (u,v) is the velocity, K is the bulk modulus,
 and :math:`\rho` is the density.
 """
-from __future__ import absolute_import
 from clawpack import riemann
 import numpy as np
 

examples/acoustics_2d_homogeneous/test_2d_acoustics.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_2d_acoustics():
     """test_2d_acoustics"""
 

examples/acoustics_2d_mapped/acoustics_2d_inclusions.py

@@ -17,9 +17,7 @@
 This example shows how to solve a problem with variable coefficients on a mapped grid.
 The domain contains circular inclusions with different acoustic properties.
 """
-from __future__ import absolute_import
 import numpy as np
-from six.moves import range
 
 # Circle radius, square radius, circle center:
 # ((r1, r2), (x0, y0))

examples/acoustics_2d_mapped/test_acoustics_2d_mapped.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_acoustics_2d_variable():
     """Test variable-coefficient 2D acoustics on mapped grids"""
 

examples/acoustics_2d_variable/acoustics_2d_interface.py

@@ -18,7 +18,6 @@
 The left and right halves of the domain consist of different materials.
 """
 
-from __future__ import absolute_import
 import numpy as np
 
 def setup(kernel_language='Fortran', use_petsc=False, outdir='./_output', 

examples/acoustics_2d_variable/test_acoustics_2d_variable.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_acoustics_2d_variable():
     """Test variable-coefficient 2D acoustics"""
 

examples/acoustics_2d_variable/test_acoustics_2d_variable_io.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
 def test_acoustics_2d_variable_io():
     """Test I/O on variable-coefficient 2D acoustics application"""
 

examples/acoustics_3d_variable/acoustics_3d_interface.py

@@ -19,7 +19,6 @@
 The left and right halves of the domain consist of different materials.
 """
 
-from __future__ import absolute_import
 import numpy as np
 
 def setup(use_petsc=False,outdir='./_output',solver_type='classic',

examples/acoustics_3d_variable/test_3d_acoustics.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import os
 from itertools import chain
 

examples/advection_1d/advection_1d.py

@@ -16,7 +16,6 @@
 The final solution is identical to the initial data because the wave has
 crossed the domain exactly once.
 """
-from __future__ import absolute_import
 import numpy as np
 from clawpack import riemann
 

examples/advection_1d/advection_1d_nonunif.py

@@ -17,7 +17,6 @@
 crossed the domain exactly once, which takes computational time 0.5, because the speed is 1 and grid length 0.5.
 """
 
-from __future__ import absolute_import
 import numpy as np
 from clawpack import riemann
 

examples/advection_1d/test_advection.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_1d_advection():
     """test_1d_advection
 

examples/advection_1d/test_advection_nonunif.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_1d_advection():
     """test_1d_advection
 

examples/advection_1d_variable/variable_coefficient_advection.py

@@ -20,7 +20,6 @@
 """
 
 
-from __future__ import absolute_import
 import numpy as np
 
 def qinit(state):

examples/advection_2d/advection_2d.py

@@ -12,7 +12,6 @@
 Here q is a conserved quantity, and (u,v) is the velocity vector.
 """
 
-from __future__ import absolute_import
 import numpy as np
 from clawpack import riemann
 

examples/advection_2d_annulus/advection_annulus.py

@@ -17,7 +17,6 @@
 This is the simplest example that shows how to use a mapped grid in PyClaw.
 However, it doesn't use a mapped-grid Riemann solver.
 """
-from __future__ import absolute_import
 import numpy as np
 
 def mapc2p_annulus(xc, yc):

examples/advection_2d_annulus/mapc2p.py

@@ -1,6 +1,3 @@
-
-
-from __future__ import absolute_import
 def mapc2p(xc,yc):
     """
     Specifies the mapping to curvilinear coordinates    

examples/advection_reaction_2d/advection_reaction.py

@@ -16,7 +16,6 @@
 This example also shows how to use your own Riemann solver.
 """
 
-from __future__ import absolute_import
 import numpy as np
 import os
 

examples/advection_reaction_2d/setup.py

@@ -3,7 +3,6 @@
 # How to use this file
 # python setup.py build_ext -i
 
-from __future__ import absolute_import
 import os
 from os.path import join as pjoin
 from os.path import pardir as pardir

examples/advection_reaction_2d/test_advection_reaction.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_advection_reaction():
     """ tests against expected sharpclaw results """
     from clawpack.pyclaw.examples.advection_reaction_2d import advection_reaction

examples/burgers_1d/burgers_1d.py

@@ -16,7 +16,6 @@
 The initial condition is sinusoidal, but after a short time a shock forms
 (due to the nonlinearity).
 """
-from __future__ import absolute_import
 import numpy as np
 from clawpack import riemann
 

examples/compare_solvers.py

@@ -1,12 +1,9 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-from __future__ import absolute_import
-from __future__ import print_function
 from clawpack import pyclaw
 import numpy as np
 import logging
-import six
 
 def debug_loggers():
     """
@@ -91,7 +88,7 @@ def compare_1D(nx=1000):
 
     times, tests = {}, {}
 
-    for name, solver in six.iteritems(solvers):
+    for name, solver in solvers.items():
         solver.bc_lower[0] = pyclaw.BC.periodic
         solver.bc_upper[0] = pyclaw.BC.periodic
 
@@ -127,7 +124,7 @@ def compare_2D(nx=(250,250)):
 
     times, tests = {}, {}
 
-    for name, solver in six.iteritems(solvers):
+    for name, solver in solvers.items():
         solver.num_waves = 3
         solver.bc_lower[0] = pyclaw.BC.extrap
         solver.bc_upper[0] = pyclaw.BC.wall

examples/cubic_1d/cubic.py

@@ -13,7 +13,6 @@
 This is a scalar nonlinear conservation law which is often used as a simple
 example for problems with non-convex flux functions.
 """
-from __future__ import absolute_import
 import numpy as np
 from clawpack import riemann
 

examples/cubic_1d/test_cubic.py

@@ -1,5 +1,4 @@
 "Runs the test problem."
-from __future__ import absolute_import
 
 def test_cubic():
     import numpy as np

examples/euler_1d/setup.py

@@ -3,7 +3,6 @@
 # How to use this file
 # python setup.py build_ext -i
 
-from __future__ import absolute_import
 import os
 from os.path import join as pjoin
 from os.path import pardir as pardir

examples/euler_1d/shocksine.py

@@ -22,8 +22,6 @@
  - How to use characteristic decomposition with an evec() routine in SharpClaw
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 from clawpack import riemann
 from clawpack.riemann.euler_with_efix_1D_constants import density, momentum, energy, num_eqn

examples/euler_1d/shocktube.py

@@ -16,7 +16,6 @@
 
 This script runs a shock-tube problem.
 """
-from __future__ import absolute_import
 from clawpack import riemann
 from clawpack.riemann.euler_with_efix_1D_constants import density, momentum, energy, num_eqn
 

examples/euler_1d/test_shocksine.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_shocksine():
     """ Test shock-sine wave interaction (Euler 1D)"""
     from . import shocksine

examples/euler_1d/test_shocktube.py

@@ -1,5 +1,4 @@
 "Runs the shocktube test problem with the Python and Fortran HLL solvers."
-from __future__ import absolute_import
 
 def test_shocktube():
     "Shock tube test (Euler 1D)"

examples/euler_1d/test_woodward_colella_blast.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_woodward_colella_blast():
     """ Woodward-Colella blast wave test (Euler 1D)"""
     from . import woodward_colella_blast

examples/euler_1d/woodward_colella_blast.py

@@ -22,8 +22,6 @@
  - How to use a total fluctuation solver in SharpClaw
  - How to use characteristic decomposition with an evec() routine in SharpClaw
 """
-from __future__ import absolute_import
-from __future__ import print_function
 from clawpack import riemann
 from clawpack.riemann.euler_with_efix_1D_constants import *
 

examples/euler_2d/euler_2d.py

@@ -19,7 +19,6 @@
 
 This example shows how to use VisClaw's Iplot class for simple interactive plotting.
 """
-from __future__ import absolute_import
 from clawpack import pyclaw
 from clawpack import riemann
 from clawpack.riemann.euler_4wave_2D_constants import density, x_momentum, y_momentum, \

examples/euler_2d/quadrants.py

@@ -17,7 +17,6 @@
 Liska and Wendroff.
 
 """
-from __future__ import absolute_import
 from clawpack import riemann
 from clawpack.riemann.euler_4wave_2D_constants import density, x_momentum, y_momentum, \
         energy, num_eqn

examples/euler_2d/shock_bubble_interaction.py

@@ -26,12 +26,10 @@
     - how to use the auxiliary array for spatially-varying coefficients
 """
 
-from __future__ import absolute_import
 import numpy as np
 from clawpack import riemann
 from clawpack.riemann.euler_5wave_2D_constants import density, x_momentum, y_momentum, \
         energy, num_eqn
-from six.moves import range
 
 gamma = 1.4 # Ratio of specific heats
 

examples/euler_2d/shock_forward_step.py

@@ -27,9 +27,6 @@
 aligned with the grid.
 """
 
-from __future__ import absolute_import
-from six.moves import range
-
 gamma = 1.4 # Ratio of specific heats
 
 def incoming_shock(state,dim,t,qbc,auxbc,num_ghost):

examples/euler_2d/test_euler2d_shockbubble.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_2d_euler_shockbubble():
     """test_2d_euler_shockbubble"""
     def verify_classic_shockbubble(controller):

examples/euler_2d/test_quadrants.py

@@ -1,5 +1,4 @@
 "Runs the quadrants test problem with the HLLC solver."
-from __future__ import absolute_import
 import numpy as np
 import os
 from . import quadrants

examples/euler_3d/Sedov.py

@@ -10,13 +10,11 @@
 The primary variables are: 
     density (rho), x,y, and z momentum (rho*u,rho*v,rho*w), and energy.
 """
-from __future__ import absolute_import
 import numpy as np
 from scipy import integrate
 from clawpack import riemann
 from clawpack.riemann.euler_3D_constants import density, x_momentum, \
                 y_momentum, z_momentum, energy, num_eqn
-from six.moves import range
 
 gamma = 1.4 # Ratio of Specific Heats
 

examples/euler_3d/shock_bubble.py

@@ -16,10 +16,8 @@
 The conserved quantities are: 
     density (rho), x-,y-, and z-momentum (rho*u,rho*v,rho*w), and energy.
 """
-from __future__ import absolute_import
 import numpy as np
 from scipy import integrate
-from six.moves import range
 
 gamma = 1.4 # Ratio of Specific Heats
 gamma1 = gamma - 1.

examples/euler_3d/shocktube.py

@@ -8,7 +8,6 @@
 The primary variables are: 
     density (rho), x,y, and z momentum (rho*u,rho*v,rho*w), and energy.
 """
-from __future__ import absolute_import
 from clawpack import riemann
 from clawpack.riemann.euler_3D_constants import density, x_momentum, \
                 y_momentum, z_momentum, energy, num_eqn

examples/euler_3d/test_sedov_and_hdf.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
 def test_sedov_and_hdf():
     """Test HDF I/O on Sedov 3D Euler application"""
 

examples/euler_gravity_3d/plotCreateVisitXDMF.py

@@ -6,8 +6,6 @@
 !   files for use visualizing within VisIt (https://visit.llnl.gov).
 !-----------------------------------------------------------------------
 """
-from __future__ import absolute_import
-from __future__ import print_function
 import os,sys
 import h5py
 from numpy import *

examples/euler_gravity_3d/rising_hot_sphere.py

@@ -10,11 +10,8 @@
 The primary variables are: 
    density (rho), x,y, and z momentum (rho*u,rho*v,rho*w), and energy.
 """
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 from mappedGrid import euler3d_mappedgrid as mg
-from six.moves import range
 
 try:
     from mpi4py import MPI

examples/euler_gravity_3d/rising_hot_sphere_spherical.py

@@ -10,11 +10,8 @@
 The primary variables are: 
    density (rho), x,y, and z momentum (rho*u,rho*v,rho*w), and energy.
 """
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 from mappedGrid import euler3d_mappedgrid as mg
-from six.moves import range
 
 # Test for MPI, and set sizes accordingly
 try:

examples/euler_gravity_3d/test_rising_hot_sphere.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 def test_euler_3d_rising_hot_sphere():
     """test_euler_3d_rising_hot_sphere"""
     def verify_classic_rising_hot_sphere(controller):

examples/euler_gravity_3d/visitHDF5XDMF.py

@@ -6,7 +6,6 @@
 ! HDF5 and XDMF routines for creating output files for VisIt.
 !-----------------------------------------------------------------------
 """
-from __future__ import absolute_import
 import os,sys
 import h5py
 from numpy import *

examples/iso_c_advection/__init__.py

@@ -1,3 +1,2 @@
-from __future__ import absolute_import
 from .iso_c_solver import ISO_C_ClawSolver1D
 from .iso_c_advection import iso_c_rp1_advection