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

examples/multi-layer/bowl-radial/setplot.py

@@ -7,13 +7,10 @@
     
 """ 
 
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools
-from six.moves import range
 import os
 
 

examples/storm-surge/ike/plot_num_grids.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import absolute_import
 import os
 import sys
 import glob
@@ -10,7 +9,6 @@
 
 # Plot customization
 import matplotlib
-from six.moves import range
 
 # Markers and line widths
 matplotlib.rcParams['lines.linewidth'] = 2.0

examples/storm-surge/isaac/plot_num_grids.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import absolute_import
 import os
 import sys
 import glob
@@ -10,7 +9,6 @@
 
 # Plot customization
 import matplotlib
-from six.moves import range
 
 # Markers and line widths
 matplotlib.rcParams['lines.linewidth'] = 2.0

examples/tsunami/chile2010/setplot.py

@@ -7,13 +7,10 @@
     
 """ 
 
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools
-from six.moves import range
 
 try:
     TG32412 = np.loadtxt('32412_notide.txt')

examples/tsunami/chile2010/setplot_kml.py

@@ -7,13 +7,10 @@
 
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools, kmltools
-from six.moves import range
 
 try:
     TG32412 = np.loadtxt('32412_notide.txt')

examples/tsunami/chile2010/setplot_speeds.py

@@ -7,13 +7,10 @@
     
 """ 
 
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools
-from six.moves import range
 
 try:
     TG32412 = np.loadtxt('32412_notide.txt')

examples/tsunami/chile2010_adjoint/adjoint/setplot.py

@@ -7,14 +7,10 @@
     
 """ 
 
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools
-from six.moves import range
-
 
 #--------------------------
 def setplot(plotdata=None):

examples/tsunami/chile2010_adjoint/setplot.py

@@ -7,13 +7,10 @@
     
 """ 
 
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools
-from six.moves import range
 
 try:
     TG32412 = np.loadtxt('32412_notide.txt')

examples/tsunami/eta_init_force_dry/setplot.py

@@ -7,13 +7,10 @@
 
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools
-from six.moves import range
 import os,sys
 
 cmax = 0.5

src/python/geoclaw/datatools/fixdata.py

@@ -12,14 +12,12 @@
 
 """
 
-from __future__ import absolute_import
 import string
 import re
 import numpy
 from numpy import *
 
 from . import iotools
-from six.moves import range
 
 #==============================================================================
 def findbadindices (Z,badvalue=inf,removenans=True):

src/python/geoclaw/datatools/iotools.py

@@ -16,7 +16,6 @@
 import string
 import re
 import numpy
-from six.moves import range
 
 
 #====================================================================

src/python/geoclaw/dtopotools.py

@@ -27,12 +27,6 @@
 
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
-
-import six
-from six.moves import range
-
 import os
 import sys
 import re
@@ -653,7 +647,7 @@ def read(self, path, column_map, coordinate_specification="centroid",
             new_subfault = SubFault()
             new_subfault.coordinate_specification = coordinate_specification
 
-            for (var, column) in six.iteritems(column_map):
+            for (var, column) in column_map.items():
                 if isinstance(column, tuple) or isinstance(column, list):
                     setattr(new_subfault, var, [None for k in column])
                     for (k, index) in enumerate(column):
@@ -662,7 +656,7 @@ def read(self, path, column_map, coordinate_specification="centroid",
                     setattr(new_subfault, var, data[n, column])
 
             if defaults is not None:
-                for param in six.iterkeys(defaults):
+                for param in defaults.keys():
                     setattr(new_subfault, param, defaults[param]) 
 
             new_subfault.convert_to_standard_units(self.input_units)
@@ -2825,7 +2819,7 @@ def set_subfaults(self,sift_slip):
                     and value = magnitude of slip to assign (in meters).
         """
         self.subfaults = []
-        for k,v in six.iteritems(sift_slip):
+        for k,v in sift_slip.items():
             subfault = self.sift_subfaults[k]
             subfault.slip = v
             self.subfaults.append(subfault)

src/python/geoclaw/fgmax_tools.py

@@ -6,13 +6,9 @@
 
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
 import os
 from numpy import sqrt, ma
 import numpy
-from six.moves import range
-
 
 class FGmaxGrid(object):
 

src/python/geoclaw/fgout_tools.py

@@ -27,8 +27,6 @@
 import os
 from numpy import sqrt, ma, mod
 import numpy
-from six.moves import range
-
 
 class FGoutFrame(object):
 

src/python/geoclaw/geoplot.py

@@ -4,13 +4,10 @@
 DEPRECATED - use the version in visclaw instead
 """
 
-from __future__ import print_function
-from __future__ import absolute_import
 from clawpack.visclaw import colormaps
 from matplotlib.colors import Normalize 
 from clawpack.geoclaw import topotools
 from numpy import ma
-from six.moves import zip
 import warnings
 
 w = """

src/python/geoclaw/kmltools.py

@@ -36,10 +36,6 @@
  - strip_archive_extensions - strip off things like .tar or .gz
 """
 
-
-from __future__ import absolute_import
-from __future__ import print_function
-from six.moves import range
 try:
     from importlib import reload
 except:

src/python/geoclaw/most2geoclaw.py

@@ -6,10 +6,7 @@
 
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
 import os, glob, re
-from six.moves import range
 
 def most2tt3(fname, fname2=None):
     """

src/python/geoclaw/multilayer/plot.py

@@ -7,13 +7,11 @@
     Kyle Mandli (2011-2-07) Initial version
 """
 
-from __future__ import absolute_import
 import numpy
 import matplotlib.pyplot as plt
 
 from clawpack.visclaw import colormaps, geoplot, gaugetools
 from clawpack.visclaw.data import ClawPlotData
-from six.moves import range
 import clawpack.geoclaw.data
 import os
 plotdata = ClawPlotData()

src/python/geoclaw/okada.py

@@ -17,20 +17,13 @@
     Xiaoming Wang.
 
 """
-from __future__ import absolute_import
-from __future__ import print_function
-import pdb
 import numpy
-#import scipy
 from numpy import *
-#from scipy import *
 from matplotlib import *
 import matplotlib.mlab as mlab
 import matplotlib.pyplot as pyplot
-import os
 import string
 from .datatools import *
-from six.moves import range
 
 #=================================================================================
 def builddeffile (okadaparamfile,faultparamfile,outfile):
@@ -49,7 +42,6 @@ def builddeffile (okadaparamfile,faultparamfile,outfile):
         dZ=fixdata.fillbaddata(dZ,ind)
 
     dZ = filtermask(dZ,faultparams)
-    #pdb.set_trace()
     for jj in range(faultparams['my']):
         j=-1-jj
         for i in range(faultparams['mx']) :
@@ -77,7 +69,6 @@ def builddynamicdeffile (okadaparamfile,faultparamfile,outfile,t0=0.0, tend=1.0,
         dZ=fixdata.fillbaddata(dZ,ind)
 
     dZ = filtermask(dZ,faultparams)
-    #pdb.set_trace()
     for it in T:
         alpha=(it-t0)/(tend-t0)
         for jj in range(faultparams['my']):

src/python/geoclaw/plotfg.py

@@ -12,8 +12,6 @@
 
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
 from pylab import *
 from clawpack.visclaw import geoplot, colormaps, plotpages
 # Cannot find this!
@@ -22,8 +20,6 @@
 import os
 from numpy import ma
 from clawpack.clawutil.data import ClawData
-from six.moves import range
-from six.moves import input
 
 
 class ClawPlotFGData(ClawData):

src/python/geoclaw/resolution.py

@@ -3,14 +3,11 @@
 
 r"""Calculate refinement resolutions given ratios provided"""
 
-from __future__ import absolute_import
-from __future__ import print_function
 import argparse
 
 import numpy as np
 
 from . import topotools
-from six.moves import range
 
 def calculate_resolution(ratios, base_resolutions=[0.25,0.25], 
                                  lat_long=True,

src/python/geoclaw/surge/storm.py

@@ -31,10 +31,6 @@
     - tcvitals (reading only)
 """
 
-from __future__ import print_function
-from __future__ import absolute_import
-from six.moves import range
-
 import warnings
 import sys
 import os

src/python/geoclaw/topotools.py

@@ -30,17 +30,13 @@
  - Add more robust plotting capabilities
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
 import os
 
 import numpy
 
 import clawpack.geoclaw.util as util
 import clawpack.clawutil.data
 import clawpack.geoclaw.data
-import six
-from six.moves import range
 
 # ==============================================================================
 #  Topography Related Functions
@@ -730,7 +726,7 @@ def read(self, path=None, topo_type=None, unstructured=False,
                     x_var = nc_params.get('x_var', None)
                     y_var = nc_params.get('y_var', None)
                     z_var = nc_params.get('z_var', None)
-                    for (key, var) in six.iteritems(nc_file.variables):
+                    for (key, var) in nc_file.variables.items():
                         if 'axis' in var.ncattrs():
                             if var.axis.lower() == "x" and x_var is None:
                                 x_var = key

src/python/geoclaw/util.py

@@ -16,15 +16,13 @@
  - fetch_noaa_tide_data - Fetches water levels and tide predictions
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
 import io
 import os
 import os.path
 
 import numpy
-from six.moves.urllib.parse import urlencode
-from six.moves.urllib.request import urlopen
+from urllib.parse import urlencode
+from urllib.request import urlopen
 
 # ==============================================================================
 #  Constants